diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-04 08:33:36 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-04 08:33:36 (GMT) |
| commit | 51c3d06e09b5e501ed7536504053c02366b2df0d (patch) | |
| tree | fe643d6d5a197902205675952a9524648eb7e1f1 /src/3rdparty/webkit/WebCore/WebCore.pro | |
| parent | 1448e19b3613ab7c5498c17c619586d03ec46d18 (diff) | |
| download | Qt-51c3d06e09b5e501ed7536504053c02366b2df0d.zip Qt-51c3d06e09b5e501ed7536504053c02366b2df0d.tar.gz Qt-51c3d06e09b5e501ed7536504053c02366b2df0d.tar.bz2 | |
Updated WebKit to de1e909b06cbc981d63e0fc0f6a3f84002dd1e80
Integrated changes:
|| <https://webkit.org/b/39694> || [Qt] GraphicsLayer: warnings when reloading page ||
|| <https://webkit.org/b/38762> || [Qt] Flash Plugin is not working on mac-cocoa-32 ||
|| <https://webkit.org/b/39918> || REGRESSION(58615): Scroll events are sent twice per keypress for ports that don't have a platformWidget scrollbar ||
|| <https://webkit.org/b/26224> || [Qt, Gtk] Allows build-webkit script to receive an install prefix as parameter ||
|| <https://webkit.org/b/35861> || [Qt] Add documentation to the QtWebkit bridge ||
|| <https://webkit.org/b/33176> || [Qt] The FIRST letter in the PASSWORD field is taken in UPPERCASE by DEFAULT in gmail.com web page ||
Diffstat (limited to 'src/3rdparty/webkit/WebCore/WebCore.pro')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 2a1536c..ba669bd 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -2166,7 +2166,7 @@ contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) { mac { SOURCES += \ plugins/mac/PluginPackageMac.cpp \ - plugins/mac/PluginViewMac.cpp + plugins/mac/PluginViewMac.mm OBJECTIVE_SOURCES += \ platform/text/mac/StringImplMac.mm \ platform/mac/WebCoreNSStringExtras.mm @@ -2852,8 +2852,12 @@ CONFIG(QTDIR_build) { !symbian { headers.files = $$WEBKIT_INSTALL_HEADERS - headers.path = $$[QT_INSTALL_HEADERS]/QtWebKit - target.path = $$[QT_INSTALL_LIBS] + + !isEmpty(INSTALL_HEADERS): headers.path = $$INSTALL_HEADERS/QtWebKit + else: headers.path = $$[QT_INSTALL_HEADERS]/QtWebKit + + !isEmpty(INSTALL_LIBS): target.path = $$INSTALL_LIBS + else: target.path = $$[QT_INSTALL_LIBS] modfile.files = $$moduleFile modfile.path = $$[QMAKE_MKSPECS]/modules @@ -2863,7 +2867,10 @@ CONFIG(QTDIR_build) { # INSTALLS is not implemented in qmake's s60 generators, copy headers manually inst_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT} inst_headers.input = WEBKIT_INSTALL_HEADERS - inst_headers.output = $$[QT_INSTALL_HEADERS]/QtWebKit/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} + + !isEmpty(INSTALL_HEADERS): inst_headers.output = $$INSTALL_HEADERS/QtWebKit/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} + else: inst_headers.output = $$[QT_INSTALL_HEADERS]/QtWebKit/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} + QMAKE_EXTRA_COMPILERS += inst_headers inst_modfile.commands = $$inst_headers.commands |