summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-06-11 14:53:13 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-13 01:07:37 +0200
commited97a0d3b9d4fec602d79bd21346186247f5e575 (patch)
tree369829e7f738b86660feb7364db194908f336a5c
parent93310ed069c54452ac9efab9b47bc99d156bf359 (diff)
Fix dependencies between quick1 and tools
Change-Id: I80ace901a2fc57f72ce9bb1d20cfa90f3faa1870 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
-rw-r--r--qt.pro6
1 files changed, 3 insertions, 3 deletions
diff --git a/qt.pro b/qt.pro
index 88eec35c..7339946d 100644
--- a/qt.pro
+++ b/qt.pro
@@ -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_qtxmlpatterns
+module_qtquick1.depends = module_qtbase module_qtscript
module_qtgraphicaleffects.subdir = qtgraphicaleffects
module_qtgraphicaleffects.target = module-qtgraphicaleffects
@@ -183,8 +183,8 @@ exists(qtactiveqt/qtactiveqt.pro) {
}
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
+# disable this for now when webkit is there to avoid a circula dependency quick1 -> tools -> webkit -> quick1
+ !exists(qtwebkit/Tools/Scripts/build-webkit):module_qtquick1.depends += module_qttools
}
!win32:!mac:exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland
exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats