summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-04-03 19:15:11 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-11 10:42:06 +0200
commitba669e8f03aaa5ce1ce9aacd4b422dc6ca83ab13 (patch)
tree75fcd3601cd53252f03137e794dc1bec5bf69947 /qt.pro
parent326ac549a1082e6aaf315fea0da08a7c40a225cd (diff)
sort subdirs by dependencies
not just using $$sort_depends(), so that the independent modules are still sorted more or less logically. Change-Id: I0c9630e338395997f7ee3cb40ef3028b8754af11 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro49
1 files changed, 24 insertions, 25 deletions
diff --git a/qt.pro b/qt.pro
index 1517358f..0d00a951 100644
--- a/qt.pro
+++ b/qt.pro
@@ -136,29 +136,12 @@ exists(qtsvg/qtsvg.pro) {
module_qtdeclarative.depends += module_qtsvg
module_qtquick1.depends += module_qtsvg
}
-exists(qtphonon/qtphonon.pro): SUBDIRS += module_qtphonon
exists(qtxmlpatterns/qtxmlpatterns.pro): SUBDIRS += module_qtxmlpatterns
-exists(qtscript/qtscript.pro): SUBDIRS += module_qtscript
+exists(qtjsbackend/qtjsbackend.pro): SUBDIRS += module_qtjsbackend
exists(qtdeclarative/qtdeclarative.pro): SUBDIRS += module_qtdeclarative
-exists(qttools/qttools.pro): SUBDIRS += module_qttools
-exists(qttranslations/qttranslations.pro): SUBDIRS += module_qttranslations
-exists(qtdoc/qtdoc.pro): SUBDIRS += module_qtdoc
-exists(qlalr/qlalr.pro): SUBDIRS += module_qlalr
-exists(qtqa/qtqa.pro): SUBDIRS += module_qtqa
-exists(qtlocation/qtlocation.pro): SUBDIRS += module_qtlocation
-exists(qtactiveqt/qtactiveqt.pro) {
- SUBDIRS += module_qtactiveqt
- module_qttools.depends += module_qtactiveqt
-}
-exists(qtsensors/qtsensors.pro): SUBDIRS += module_qtsensors
-exists(qtsystems/qtsystems.pro): SUBDIRS += module_qtsystems
-exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia
-exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
exists(qt3d/qt3d.pro): SUBDIRS += module_qt3d
-exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery
-exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim
-exists(qtconnectivity/qtconnectivity.pro): SUBDIRS += module_qtconnectivity
-!win32:!mac:exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland
+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
@@ -166,13 +149,29 @@ exists(qtjsondb/qtjsondb.pro) {
module_qtdocgallery.depends += module_qtjsondb
module_qtsystems.depends += module_qtjsondb
}
-exists(qtjsbackend/qtjsbackend.pro): SUBDIRS += module_qtjsbackend
-exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats
-exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1
-exists(qtgraphicaleffects/qtgraphicaleffects.pro): SUBDIRS += module_qtgraphicaleffects
-
+exists(qtlocation/qtlocation.pro): SUBDIRS += module_qtlocation
+exists(qtsensors/qtsensors.pro): SUBDIRS += module_qtsensors
+exists(qtsystems/qtsystems.pro): SUBDIRS += module_qtsystems
+exists(qtphonon/qtphonon.pro): SUBDIRS += module_qtphonon
+exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia
+exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
+exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery
+exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim
+exists(qtconnectivity/qtconnectivity.pro): SUBDIRS += module_qtconnectivity
exists(qtwebkit/Tools/Scripts/build-webkit) {
SUBDIRS += module_qtwebkit \
module_qtwebkit_examples_and_demos
module_qttools.depends += module_qtwebkit
}
+exists(qtactiveqt/qtactiveqt.pro) {
+ SUBDIRS += module_qtactiveqt
+ module_qttools.depends += module_qtactiveqt
+}
+exists(qttools/qttools.pro): SUBDIRS += 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
+exists(qttranslations/qttranslations.pro): SUBDIRS += module_qttranslations
+exists(qtdoc/qtdoc.pro): SUBDIRS += module_qtdoc
+exists(qtqa/qtqa.pro): SUBDIRS += module_qtqa
+exists(qlalr/qlalr.pro): SUBDIRS += module_qlalr