diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 17:20:34 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 17:20:34 +0200 |
| commit | f651be32bff238765b371f62b40b7ec74bdf8a03 (patch) | |
| tree | 0fdc5f4dce832f79aa87db6cac1e79990706e3ea /src/src.pro | |
| parent | ce1c485bea8baddbc89d35b3a0f94374205d94a3 (diff) | |
| parent | a43df009713c7df7b19336db5cee8306da62d186 (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
QtWebKit: Fix the QWebHistory serialization auto-test
Mark QWebFrame::overloadedSlots autotest as expected failure
QtWebKit: Fix autotests .qrc file paths when built from tests/auto/qweb*
QtWebKit: Build fix for WinCE.
Fix the build of webkit examples on platforms without OpenGL and Multimedia
QtWebKit: Fix build on mac.
QtWebKit: Fix build on WinCE, adding missing include path.
QtWebKit: Add missing namespace wrapper temporarily until next import.
QtWebKit: fix build with qws temporarily until next import.
Update src/3rdparty/webkit from trunk.
Fix failing assertions in debug builds
Fix the build of webkit examples on platforms without OpenGL and Multimedia
QtWebKit: Fix build on mac.
QtWebKit: Build fix for WinCE.
QtWebKit: Fix build on WinCE, adding missing include path.
QtWebKit: Change the dependency from phonon to QtMultimedia.
QtWebKit: Add missing namespace wrapper temporarily until next import.
QtWebKit: fix build with qws temporarily until next import.
Update src/3rdparty/webkit from trunk.
QtWebKit: Re-add the dependency to the static linked JavaScriptCore
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/src.pro b/src/src.pro index 70beb464b4..c74b0ca4b7 100644 --- a/src/src.pro +++ b/src/src.pro @@ -16,15 +16,15 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, o contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg contains(QT_CONFIG, xmlpatterns): SRC_SUBDIRS += src_xmlpatterns contains(QT_CONFIG, phonon): SRC_SUBDIRS += src_phonon +contains(QT_CONFIG, multimedia): SRC_SUBDIRS += src_multimedia contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg contains(QT_CONFIG, webkit) { - #exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): SRC_SUBDIRS += src_javascriptcore + exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): SRC_SUBDIRS += src_javascriptcore SRC_SUBDIRS += src_webkit } contains(QT_CONFIG, script): SRC_SUBDIRS += src_script !contains(QT_CONFIG, no-gui):contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_declarative -contains(QT_CONFIG, multimedia): SRC_SUBDIRS += src_multimedia SRC_SUBDIRS += src_plugins contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_imports @@ -112,11 +112,11 @@ src_declarative.target = sub-declarative src_imports.depends = src_gui src_declarative contains(QT_CONFIG, webkit) { src_webkit.depends = src_gui src_sql src_network src_xml - contains(QT_CONFIG, phonon):src_webkit.depends += src_phonon + contains(QT_CONFIG, multimedia):src_webkit.depends += src_multimedia contains(QT_CONFIG, xmlpatterns): src_webkit.depends += src_xmlpatterns contains(QT_CONFIG, declarative):src_declarative.depends += src_webkit src_imports.depends += src_webkit - #exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): src_webkit.depends += src_javascriptcore + exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): src_webkit.depends += src_javascriptcore } contains(QT_CONFIG, qt3support): src_plugins.depends += src_qt3support contains(QT_CONFIG, dbus):{ |