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 | |
| 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>
| -rw-r--r-- | installerfw.pri | 6 | ||||
| -rw-r--r-- | src/sdk/sdk.pro | 4 |
2 files changed, 5 insertions, 5 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 diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro index b2588603b..2f57994f0 100644 --- a/src/sdk/sdk.pro +++ b/src/sdk/sdk.pro @@ -12,7 +12,7 @@ isEqual(QT_MAJOR_VERSION, 5) { DESTDIR = $$IFW_APP_PATH -if (exists($$LRELEASE)) { +exists($$LRELEASE) { QT_LANGUAGES = qt_de qt_ru qt_zh_CN qt_ja IB_LANGUAGES = de_de en_us ru_ru zh_cn ja_jp defineReplace(prependAll) { @@ -56,7 +56,7 @@ if (exists($$LRELEASE)) { updateqm.CONFIG += no_link target_predeps QMAKE_EXTRA_COMPILERS += updateqm - if (exists($$RCC)) { + exists($$RCC) { RESOURCE_IB_TRANSLATIONS = $$prependAll(IB_LANGUAGES, $$PWD/translations/,.qm) RESOURCE_QT_TRANSLATIONS = $$prependAll(QT_LANGUAGES, $$PWD/translations/,.qm) RESOURCE = $$PWD/installerbase.qrc |