summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2012-07-06 09:00:08 +1000
committerQt by Nokia <qt-info@nokia.com>2012-07-06 01:41:53 +0200
commite17c87df9c4e31cb23cc71758972ac1254a415db (patch)
tree7986648aadc2fe5f1d49acc15fa4dd6f78951c7d /mkspecs
parent5f04a127a7b25f4e393e1c33639c7a83ec2f375a (diff)
qt_parts.prf: fixed examples, tests, tools always disabled
exists() resolves the path relative to qmake's current working directory, which is mkspecs/features. Explicitly refer to the full path. Change-Id: I04e9f377528bffc1ebeeed69c86d73b85a117423 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qt_parts.prf8
1 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/features/qt_parts.prf b/mkspecs/features/qt_parts.prf
index 9257f5612f..a99fdaddf2 100644
--- a/mkspecs/features/qt_parts.prf
+++ b/mkspecs/features/qt_parts.prf
@@ -6,7 +6,7 @@ sub_src.subdir = src
sub_src.target = sub-src
SUBDIRS = sub_src
-exists(tools/tools.pro) {
+exists($$_PRO_FILE_PWD_/tools/tools.pro) {
sub_tools.subdir = tools
sub_tools.target = sub-tools
sub_tools.depends = sub_src
@@ -14,7 +14,7 @@ exists(tools/tools.pro) {
SUBDIRS += sub_tools
}
-exists(examples/examples.pro) {
+exists($$_PRO_FILE_PWD_/examples/examples.pro) {
sub_examples.subdir = examples
sub_examples.target = sub-examples
sub_examples.depends = sub_src
@@ -23,7 +23,7 @@ exists(examples/examples.pro) {
}
# Some modules still have these
-exists(demos/demos.pro) {
+exists($$_PRO_FILE_PWD_/demos/demos.pro) {
sub_demos.subdir = examples
sub_demos.target = sub-examples
sub_demos.depends = sub_src
@@ -31,7 +31,7 @@ exists(demos/demos.pro) {
SUBDIRS += sub_demos
}
-exists(tests/tests.pro) {
+exists($$_PRO_FILE_PWD_/tests/tests.pro) {
sub_tests.subdir = tests
sub_tests.target = sub-tests
sub_tests.depends = sub_src # The tests may have a run-time only dependency on tools