summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2012-03-21 12:13:19 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-21 14:39:14 +0100
commitc04675aab84140d1c450a6c5569c1196105b8cf7 (patch)
tree4a499ec501b965985a2ba880acbadf44b9dd831c /qt.pro
parent10fe94d265413c52a958d4c5e4419d97b927df8e (diff)
Only add dependency to qtactiveqt if it's available
Don't need to be platform specific about it. Change-Id: I3ca981ec03b977961afaa18f09cde10b8b99c64e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro6
1 files changed, 4 insertions, 2 deletions
diff --git a/qt.pro b/qt.pro
index d64c62f0..20e22597 100644
--- a/qt.pro
+++ b/qt.pro
@@ -43,7 +43,6 @@ module_qtwebkit_examples_and_demos.depends = module_qtwebkit
module_qttools.subdir = $$IN_PWD/qttools
module_qttools.target = module-qttools
module_qttools.depends = module_qtbase module_qtscript module_qtquick1 module_qtdeclarative
-win32:module_qttools.depends += module_qtactiveqt
module_qttranslations.subdir = $$IN_PWD/qttranslations
module_qttranslations.target = module-qttranslations
@@ -147,7 +146,10 @@ 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
+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