diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-09-12 21:22:20 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-09-12 21:22:20 (GMT) |
| commit | 8545436476497cf8aa9e7af46000f283cbbfb3d9 (patch) | |
| tree | f8a3b065cbe21851064721120b9af29787e56058 /src/3rdparty/webkit/WebCore/WebCore.pro | |
| parent | 2b527006a3e9147a447a08d78004e20a7ac3d17c (diff) | |
| download | Qt-8545436476497cf8aa9e7af46000f283cbbfb3d9.zip Qt-8545436476497cf8aa9e7af46000f283cbbfb3d9.tar.gz Qt-8545436476497cf8aa9e7af46000f283cbbfb3d9.tar.bz2 | |
Updated WebKit to 715b53069911a31a559aa0b3d94ffc6a5ac20988
Sync with qtwebkit-2.0 branch
* Includes Thiago's intel compiler fixes
* Girish' Maemo5 local rendering fixes
Diffstat (limited to 'src/3rdparty/webkit/WebCore/WebCore.pro')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 5ea1e77..87638a0 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -2192,6 +2192,9 @@ contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) { CONFIG += x11 LIBS += -lXrender } + maemo5 { + DEFINES += MOZ_PLATFORM_MAEMO=5 + } SOURCES += \ plugins/qt/PluginContainerQt.cpp \ plugins/qt/PluginPackageQt.cpp \ @@ -2857,13 +2860,13 @@ contains(DEFINES, ENABLE_SYMBIAN_DIALOG_PROVIDERS) { } } -!symbian-abld:!symbian-sbsv2 { +!symbian { modfile.files = $$moduleFile modfile.path = $$[QMAKE_MKSPECS]/modules INSTALLS += modfile } else { - # INSTALLS is not implemented in qmake's mmp generators, copy headers manually + # INSTALLS is not implemented in qmake's s60 generators, copy headers manually inst_modfile.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT} inst_modfile.input = moduleFile @@ -2883,7 +2886,7 @@ HEADERS += $$WEBKIT_API_HEADERS exists($$OUTPUT_DIR/include/QtWebKit/classheaders.pri): include($$OUTPUT_DIR/include/QtWebKit/classheaders.pri) WEBKIT_INSTALL_HEADERS = $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS - !symbian { + !symbian-abld:!symbian-sbsv2 { headers.files = $$WEBKIT_INSTALL_HEADERS !isEmpty(INSTALL_HEADERS): headers.path = $$INSTALL_HEADERS/QtWebKit @@ -2894,7 +2897,7 @@ HEADERS += $$WEBKIT_API_HEADERS INSTALLS += target headers } else { - # INSTALLS is not implemented in qmake's s60 generators, copy headers manually + # INSTALLS is not implemented in qmake's mmp generators, copy headers manually inst_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT} inst_headers.input = WEBKIT_INSTALL_HEADERS inst_headers.CONFIG = no_clean |