summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-19 18:24:37 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-29 03:41:35 +0200
commitac8b26c0b25ef40032a43903efb691b5d653afc2 (patch)
treeaeb8601f1af66ed7e37e92d4b3f5e2222a78f13c /qt.pro
parent222a34624901df4727e2608c3e7da340aba1ab7f (diff)
fix SUBDIRS sorting according to dependencies again
quick1 depends on tools now Change-Id: I1575c03af2e6af1244f75d3c9e72481536d1a913 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/qt.pro b/qt.pro
index c2058334..431805be 100644
--- a/qt.pro
+++ b/qt.pro
@@ -147,7 +147,6 @@ exists(qtjsbackend/qtjsbackend.pro): SUBDIRS += module_qtjsbackend
exists(qtdeclarative/qtdeclarative.pro): SUBDIRS += module_qtdeclarative
exists(qt3d/qt3d.pro): SUBDIRS += module_qt3d
exists(qtscript/qtscript.pro): SUBDIRS += module_qtscript
-exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1
exists(qtjsondb/qtjsondb.pro) {
SUBDIRS += module_qtjsondb
# These modules do not require qtjsondb, but can use it if it is available
@@ -194,6 +193,7 @@ exists(qttools/qttools.pro) {
# 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
}
+exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1
!win32:!mac:exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland
exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats
exists(qtgraphicaleffects/qtgraphicaleffects.pro): SUBDIRS += module_qtgraphicaleffects