diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 14:01:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 14:01:31 (GMT) |
| commit | 9b648cc6f0354d0d7a36f453c3c997a08bbb6452 (patch) | |
| tree | b293580c775a29984eb1749d648e256ea0984ac4 /mkspecs/features/qt_functions.prf | |
| parent | 03eae990b1aea880ee863061e1429edc4a96c626 (diff) | |
| parent | d36be1232e4f11cf5dc121bb60c628970b88ac2a (diff) | |
| download | Qt-9b648cc6f0354d0d7a36f453c3c997a08bbb6452.zip Qt-9b648cc6f0354d0d7a36f453c3c997a08bbb6452.tar.gz Qt-9b648cc6f0354d0d7a36f453c3c997a08bbb6452.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix path separators in install targets for MinGW+sh
fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
define qtPrepareTool() function and use it throughout
QNAM HTTP: And one more testcase
QNetworkAccessManager: Backends were tried in wrong order
Diffstat (limited to 'mkspecs/features/qt_functions.prf')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 1be6d9b..23e2616 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -78,3 +78,14 @@ defineTest(qtAddLibrary) { export(QMAKE_LFLAGS) return(true) } + +# variable, default +defineTest(qtPrepareTool) { + isEmpty($$1) { + !isEmpty(QT_BUILD_TREE):$$1 = $$QT_BUILD_TREE/bin/$$2 + else:$$1 = $$[QT_INSTALL_BINS]/$$2 + } + $$1 ~= s,[/\\\\],$$QMAKE_DIR_SEP, + contains(QMAKE_HOST.os, Windows):!contains($$1, \.exe$):$$1 = $$eval($$1).exe + export($$1) +} |