diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-30 22:12:50 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-30 22:12:50 +1000 |
| commit | b4d96f534ed84c3bc070b7b40f61b897f2fcfe78 (patch) | |
| tree | 40cc22d507d982506f82de437f7788dd1858d0d9 | |
| parent | 26eb2d9ce78929018b93d81922e002a68bcee56e (diff) | |
| parent | 8c17d175f47cecc80e44107e0cdab45aacfaa07b (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team:
Make sure JavaScriptCore is build once.
| -rw-r--r-- | src/src.pro | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/src.pro b/src/src.pro index c8b61415bc..da11b6917c 100644 --- a/src/src.pro +++ b/src/src.pro @@ -22,7 +22,6 @@ contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg contains(QT_CONFIG, script): SRC_SUBDIRS += src_script contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_declarative contains(QT_CONFIG, webkit) { - exists($$QT_SOURCE_TREE/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pro): SRC_SUBDIRS += src_javascriptcore SRC_SUBDIRS += src_webkit } !contains(QT_CONFIG, no-gui):contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools @@ -78,8 +77,6 @@ src_imports.subdir = $$QT_SOURCE_TREE/src/imports src_imports.target = sub-imports src_testlib.subdir = $$QT_SOURCE_TREE/src/testlib src_testlib.target = sub-testlib -src_javascriptcore.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/JavaScriptCore -src_javascriptcore.target = sub-javascriptcore src_webkit.file = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/WebKit.pro src_webkit.target = sub-webkit src_declarative.subdir = $$QT_SOURCE_TREE/src/declarative @@ -121,10 +118,6 @@ src_webkit_declarative.target = sub-webkitdeclarative src_webkit.depends = src_gui src_sql src_network contains(QT_CONFIG, xmlpatterns): src_webkit.depends += src_xmlpatterns src_imports.depends += src_webkit - exists($$QT_SOURCE_TREE/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pro) { - src_webkit.depends += src_javascriptcore - src_javascriptcore.depends = src_corelib - } } contains(QT_CONFIG, qt3support): src_plugins.depends += src_qt3support contains(QT_CONFIG, dbus):{ |