summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-06-02 14:11:08 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-08 15:06:56 +0200
commit93310ed069c54452ac9efab9b47bc99d156bf359 (patch)
tree032a11e1683348022be4bbcead22c7f8d64f2770 /qt.pro
parentfd18c7da239856b6e8203b738f751b023fa2324e (diff)
qtquick1 now depends on qttools, not the other way round
This depends on https://codereview.qt-project.org/#change,28044 and https://codereview.qt-project.org/#change,28047 Change-Id: I1587b0c4b8f3d3b25acf6106aedf0824270da98d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro10
1 files changed, 7 insertions, 3 deletions
diff --git a/qt.pro b/qt.pro
index 8cfe415e..88eec35c 100644
--- a/qt.pro
+++ b/qt.pro
@@ -42,7 +42,7 @@ module_qtwebkit_examples_and_demos.depends = module_qtwebkit
module_qttools.subdir = qttools
module_qttools.target = module-qttools
-module_qttools.depends = module_qtbase module_qtquick1 module_qtdeclarative
+module_qttools.depends = module_qtbase module_qtdeclarative
module_qttranslations.subdir = qttranslations
module_qttranslations.target = module-qttranslations
@@ -116,7 +116,7 @@ module_qtimageformats.depends = module_qtbase
module_qtquick1.subdir = qtquick1
module_qtquick1.target = module-qtquick1
-module_qtquick1.depends = module_qtbase module_qtscript
+module_qtquick1.depends = module_qtbase module_qtscript module_qtxmlpatterns
module_qtgraphicaleffects.subdir = qtgraphicaleffects
module_qtgraphicaleffects.target = module-qtgraphicaleffects
@@ -181,7 +181,11 @@ exists(qtactiveqt/qtactiveqt.pro) {
SUBDIRS += module_qtactiveqt
module_qttools.depends += module_qtactiveqt
}
-exists(qttools/qttools.pro): SUBDIRS += module_qttools
+exists(qttools/qttools.pro) {
+ SUBDIRS += module_qttools
+# disable this for now to avoid a circula dependency quick1 -> tools -> webkit -> quick1
+# module_qtquick1.depends += module_qttools
+}
!win32:!mac:exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland
exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats
exists(qtgraphicaleffects/qtgraphicaleffects.pro): SUBDIRS += module_qtgraphicaleffects