QuasarApp/installer-framework
4
0
Fork 0
mirror of https://github.com/QuasarApp/installer-framework.git synced 2025-04-27 06:04:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix: Path handling in project files

Browse Source 
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>
This commit is contained in:
Takumi Asaki 2014-01-28 13:32:02 +09:00 committed by Niels Weber
parent 0dbdd3edcc
commit 303d245db9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
installerfw.pri
View File

@ -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

4
src/sdk/sdk.pro
View File

@ -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