Changeset 69304 in webkit


Ignore:
Timestamp:
Oct 7, 2010 6:11:55 AM (14 years ago)
Author:
luiz@webkit.org
Message:

2010-10-07 Luiz Agostini <​luiz.agostini@openbossa.org>

Reviewed by Adam Roben.

[Qt] Webkit2 MacOS build fix
​https://bugs.webkit.org/show_bug.cgi?id=47167

There were two problems when building Qt WebKit2 in Mac. The first was that
ld does not support flag -whole-archive and it needed to be replaced by flag -all_load.
The second problem was that APPLE is been used to identify safari builds and, when
building Qt in MacOS, Qt was ending up using the wrong typedef. The solution was to use
a Qt specific WKNativeEvent.h that only has the proper Qt typedef instead of the original one.

  • UIProcess/API/C/qt/WKNativeEvent.h: Added.
  • WebKit2.pri:
  • WebKit2.pro:
Location:
trunk/WebKit2
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit2/ChangeLog

    r69297 r69304  
     12010-10-07  Luiz Agostini  <luiz.agostini@openbossa.org>
     2
     3        Reviewed by Adam Roben.
     4
     5        [Qt] Webkit2 MacOS build fix
     6        https://bugs.webkit.org/show_bug.cgi?id=47167
     7
     8        There were two problems when building Qt WebKit2 in Mac. The first was that
     9        ld does not support flag -whole-archive and it needed to be replaced by flag -all_load.
     10        The second problem was that __APPLE__ is been used to identify safari builds and, when
     11        building Qt in MacOS, Qt was ending up using the wrong typedef. The solution was to use
     12        a Qt specific WKNativeEvent.h that only has the proper Qt typedef instead of the original one.
     13
     14        * UIProcess/API/C/qt/WKNativeEvent.h: Added.
     15        * WebKit2.pri:
     16        * WebKit2.pro:
     17
    1182010-10-07  Balazs Kelemen  <kbalazs@webkit.org>
    219

  • trunk/WebKit2/WebKit2.pri

    r69107 r69304  
    1515
    1616    # Make symbols visible
    17     QMAKE_LFLAGS += -Wl,-whole-archive -l$$WEBKIT2_TARGET -Wl,-no-whole-archive
     17    mac:QMAKE_LFLAGS += -Wl,-all_load -l$$WEBKIT2_TARGET
     18    else:QMAKE_LFLAGS += -Wl,-whole-archive -l$$WEBKIT2_TARGET -Wl,-no-whole-archive
    1819
    1920    POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}lib$${WEBKIT2_TARGET}.a

  • trunk/WebKit2/WebKit2.pro

    r69244 r69304  
    208208    UIProcess/API/C/WKFrame.h \
    209209    UIProcess/API/C/WKFramePolicyListener.h \
    210     UIProcess/API/C/WKNativeEvent.h \
    211210    UIProcess/API/C/WKNavigationData.h \
    212211    UIProcess/API/C/WKPage.h \
    … …  
    215214    UIProcess/API/C/WKPreferences.h \
    216215    UIProcess/API/C/WKPreferencesPrivate.h \
     216    UIProcess/API/C/qt/WKNativeEvent.h \
    217217    UIProcess/API/cpp/qt/WKStringQt.h \
    218218    UIProcess/API/cpp/qt/WKURLQt.h \
Note: See TracChangeset for help on using the changeset viewer.