From 8f7c4684fea32eb85299931d95ea3566c262797d Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 17 May 2011 15:46:21 +1000 Subject: [PATCH 1/2] The qtlocation module depends on declarative too --- qt.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt.pro b/qt.pro index 78cff58c..d01e522c 100644 --- a/qt.pro +++ b/qt.pro @@ -67,7 +67,7 @@ module_qtqa.depends = module-qtbase module_qtlocation.subdir = $$IN_PWD/qtlocation module_qtlocation.target = module-qtlocation -module_qtlocation.depends = module-qtbase +module_qtlocation.depends = module-qtbase module_qtdeclarative # not yet enabled by default module_qtlocation.CONFIG = no_default_target no_default_install From 5360908e1438d399398ffc71e5bf7e4e92421f32 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Thu, 19 May 2011 08:48:24 +1000 Subject: [PATCH 2/2] Clean up inconsistent usage of `depends' in qt.pro Some of the depends were referring to qmake targets and some of them were referring to make targets. That's unnecessarily confusing. Make them consistent. --- qt.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qt.pro b/qt.pro index d01e522c..5aa4c7dd 100644 --- a/qt.pro +++ b/qt.pro @@ -59,15 +59,15 @@ module_qtactiveqt.depends = module_qtbase module_qlalr.subdir = $$IN_PWD/qlalr module_qlalr.target = module-qlalr -module_qlalr.depends = module-qtbase +module_qlalr.depends = module_qtbase module_qtqa.subdir = $$IN_PWD/qtqa module_qtqa.target = module-qtqa -module_qtqa.depends = module-qtbase +module_qtqa.depends = module_qtbase module_qtlocation.subdir = $$IN_PWD/qtlocation module_qtlocation.target = module-qtlocation -module_qtlocation.depends = module-qtbase module_qtdeclarative +module_qtlocation.depends = module_qtbase module_qtdeclarative # not yet enabled by default module_qtlocation.CONFIG = no_default_target no_default_install