diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-01-06 12:52:17 -0600 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 12:05:51 +0200 |
| commit | 82bf3bd7757b6c5a6bfe2c6e7cdceb8701268a27 (patch) | |
| tree | ee950d4060a2e6df83f53d3025df7f73a2129254 /mkspecs/features | |
| parent | 3ec5d966574f1a9da7cfde573771cb95c376ce7c (diff) | |
Make each module refer to its own bin/
Since modules cannot rely on QtCore having a build directory, nor
can they build the applications directly into $$[QT_INSTALL_BINS]
each module needs their own bin/. Add this path to each module's
pri file, so others can use their applications
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qt_config.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf index 2973c7e414..7e80ad38e8 100644 --- a/mkspecs/features/qt_config.prf +++ b/mkspecs/features/qt_config.prf @@ -20,6 +20,7 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { # qt_<module>.pri forwarding file QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS] QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS] + QT_MODULE_BIN_BASE = $$[QT_INSTALL_BINS] include($$mod) } } diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index b9b0fd839b..df4508d85c 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -157,10 +157,13 @@ defineTest(qtAddModule) { # variable, default defineTest(qtPrepareTool) { - isEmpty($$1) { - !isEmpty(QT_BUILD_TREE):$$1 = $$QT_BUILD_TREE/bin/$$2 - else:$$1 = $$[QT_INSTALL_BINS]/$$2 + MODBASE = $$[QT_INSTALL_BINS] + !isEmpty(QT_BUILD_TREE):MODBASE = $$QT_BUILD_TREE/bin + count(ARGS, 2, greaterThan) { + isEmpty(QT.$${3}.bins):warning("No QT.$${3}.bins, module path ignored for qtPrepareTool($$1, $$2, $$3)") + else:MODBASE = $$eval(QT.$${3}.bins) } + isEmpty($$1):$$1 = $$MODBASE/$$2 $$1 ~= s,[/\\\\],$$QMAKE_DIR_SEP, contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { exists($$eval($$1).bat) { |