diff options
author | Takumi Asaki <asaki@sra.co.jp> | 2014-01-28 13:32:02 +0900 |
---|---|---|
committer | Niels Weber <niels.weber@digia.com> | 2014-02-03 15:42:44 +0100 |
commit | 303d245db9030b2e04058f6901f0f6fa37281cd3 (patch) | |
tree | 927f2df99c74a6701b400189b9fbd2c35c32e46e /installerfw.pri | |
parent | 0dbdd3edcc465b7edfd84322c939ae533688053a (diff) |
Fix: Path handling in project files
Because of cleanPath() converts native separators to '/',
call toNativeSeparators() after cleanPath().
Due to warning message from "if (exists(filePath))" on Windows,
if() around the exists() are removed.
Change-Id: I412fe83f13365c8eec00e119270d07ce7f72297d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'installerfw.pri')
-rw-r--r-- | installerfw.pri | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/installerfw.pri b/installerfw.pri index ffd49f1f6..bd84092a3 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -36,9 +36,9 @@ IFW_SOURCE_TREE = $$PWD IFW_APP_PATH = $$IFW_BUILD_TREE/bin IFW_LIB_PATH = $$IFW_BUILD_TREE/lib -RCC = $$cleanPath($$toNativeSeparators($$[QT_INSTALL_BINS]/rcc)) -LRELEASE = $$cleanPath($$toNativeSeparators($$[QT_INSTALL_BINS]/lrelease)) -QMAKE_BINARY = $$cleanPath($$toNativeSeparators($$[QT_INSTALL_BINS]/qmake)) +RCC = $$toNativeSeparators($$cleanPath($$[QT_INSTALL_BINS]/rcc)) +LRELEASE = $$toNativeSeparators($$cleanPath($$[QT_INSTALL_BINS]/lrelease)) +QMAKE_BINARY = $$toNativeSeparators($$cleanPath($$[QT_INSTALL_BINS]/qmake)) win32:RCC = $${RCC}.exe win32:LRELEASE = $${LRELEASE}.exe |