Changeset 58905 in webkit


Ignore:
Timestamp:
May 6, 2010 1:26:55 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-05-06 Laszlo Gombos <Laszlo Gombos>

Unreviewed, build fix WinCE for QtWebKit.

[Qt] Compilation with Plugins disabled is broken
​https://bugs.webkit.org/show_bug.cgi?id=31407

Rename platform/qt/TemporaryLinkStubs.cpp to avoid name collition on
Windows.

Thanks for Ismail "cartman" Donmez for help.

No new tests, as there is no new functionality.

  • WebCore.gypi:
  • WebCore.pro:
  • platform/qt/TemporaryLinkStubs.cpp: Removed.
  • platform/qt/TemporaryLinkStubsQt.cpp: Copied from WebCore/platform/qt/TemporaryLinkStubs.cpp.
Location:
trunk/WebCore
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r58903 r58905  
     12010-05-06  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
     2
     3        Unreviewed, build fix WinCE for QtWebKit.
     4
     5        [Qt] Compilation with Plugins disabled is broken
     6        https://bugs.webkit.org/show_bug.cgi?id=31407
     7
     8        Rename platform/qt/TemporaryLinkStubs.cpp to avoid name collition on
     9        Windows.
     10
     11        Thanks for Ismail "cartman" Donmez for help.
     12
     13        No new tests, as there is no new functionality.
     14
     15        * WebCore.gypi:
     16        * WebCore.pro:
     17        * platform/qt/TemporaryLinkStubs.cpp: Removed.
     18        * platform/qt/TemporaryLinkStubsQt.cpp: Copied from WebCore/platform/qt/TemporaryLinkStubs.cpp.
     19
    1202010-05-06  Simon Hausmann  <simon.hausmann@nokia.com>
    221

  • trunk/WebCore/WebCore.gypi

    r58832 r58905  
    26552655            'platform/qt/SharedTimerQt.cpp',
    26562656            'platform/qt/SoundQt.cpp',
    2657             'platform/qt/TemporaryLinkStubs.cpp',
     2657            'platform/qt/TemporaryLinkStubsQt.cpp',
    26582658            'platform/qt/WheelEventQt.cpp',
    26592659            'platform/qt/WidgetQt.cpp',

  • trunk/WebCore/WebCore.pro

    r58832 r58905  
    21132113    platform/qt/SoundQt.cpp \
    21142114    platform/qt/LoggingQt.cpp \
    2115     platform/qt/TemporaryLinkStubs.cpp \
     2115    platform/qt/TemporaryLinkStubsQt.cpp \
    21162116    platform/text/qt/TextBoundariesQt.cpp \
    21172117    platform/text/qt/TextBreakIteratorQt.cpp \
Note: See TracChangeset for help on using the changeset viewer.