From c04675aab84140d1c450a6c5569c1196105b8cf7 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Wed, 21 Mar 2012 12:13:19 +0100 Subject: 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 Reviewed-by: Lars Knoll Reviewed-by: Oswald Buddenhagen --- qt.pro | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'qt.pro') 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 -- cgit v1.2.3