summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@nokia.com>2010-06-23 09:00:10 (GMT)
committerAlexis Menard <alexis.menard@nokia.com>2010-06-23 09:00:27 (GMT)
commit7bf0f4bc2d91cb2211d63c343d190ccd9bcd98fd (patch)
tree7f08cd94151f1ca49f683c2743cfaf33826becc6 /src
parent25da7da1b5b454eae0b8080a97fd4a37d688aa54 (diff)
downloadQt-7bf0f4bc2d91cb2211d63c343d190ccd9bcd98fd.zip
Qt-7bf0f4bc2d91cb2211d63c343d190ccd9bcd98fd.tar.gz
Qt-7bf0f4bc2d91cb2211d63c343d190ccd9bcd98fd.tar.bz2
Build declarative before webkit.
Diffstat (limited to 'src')
-rw-r--r--src/src.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/src.pro b/src/src.pro
index 0d7404d..0573c2d 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -18,13 +18,13 @@ 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, script): SRC_SUBDIRS += src_script
+contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_declarative
contains(QT_CONFIG, webkit) {
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
SRC_SUBDIRS += src_plugins
contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_imports
contains(QT_CONFIG, declarative):contains(QT_CONFIG, webkit): SRC_SUBDIRS += src_webkit_declarative