qtquick1 now depends on qttools, not the other way round master_201206082327
authorLars Knoll <lars.knoll@nokia.com>
Sat, 2 Jun 2012 12:11:08 +0000 (14:11 +0200)
committerQt by Nokia <qt-info@nokia.com>
Fri, 8 Jun 2012 13:06:56 +0000 (15:06 +0200)
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>
build.dependencies
qt.pro

index 542fd50..ed13bb6 100644 (file)
@@ -24,12 +24,12 @@ use Config;
     "qtphonon" => "qtbase",
     "qtpim" => "qtdeclarative,qtjsondb:s",
     "qtqa" => "qtbase",
-    "qtquick1" => "qtbase,qtscript,qtxmlpatterns,qtsvg:s",
+    "qtquick1" => "qtbase,qtscript,qtxmlpatterns,qttools,qtsvg:s",
     "qtscript" => "qtbase",
     "qtsensors" => "qtbase,qtdeclarative",
     "qtsvg" => "qtbase",
     "qtsystems" => "qtbase,qtdeclarative,qtjsondb:s",
-    "qttools" => "qtbase,qtscript,qtdeclarative,qtquick1,qtwebkit:s",
+    "qttools" => "qtbase,qtdeclarative,qtwebkit:s",
     "qttranslations" => "qttools",
     "qtwebkit" => "qtbase,qtscript,qtdeclarative,qtquick1,qtlocation",
     "qtwebkit-examples-and-demos" => "qtwebkit",
diff --git a/qt.pro b/qt.pro
index 8cfe415..88eec35 100644 (file)
--- 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