Qt: Fix up lrelease path when outside of qtdir and version string for Symbian.

This commit is contained in:
Sacha 2014-06-23 01:58:20 +10:00
parent 12cef8fa80
commit 6e5d7ed455
2 changed files with 9 additions and 6 deletions

View File

@ -117,11 +117,14 @@ INCLUDEPATH += $$P $$P/Common $$P/native $$P/native/ext
INCLUDEPATH += $$P/Qt $$P/Qt/Debugger
# Creating translations should be done by Qt, really
LREL_TOOL = $$[QT_INSTALL_BINS]/lrelease
LREL_TOOL = lrelease
# Grab all possible directories (win32/unix) and search from last to first
win32: PATHS = $$reverse($$split($$(PATH), ;))
else: PATHS = $$reverse($$split($$(PATH), :))
greaterThan(QT_MAJOR_VERSION, 4) {
exists($${LREL_TOOL}-qt5): LREL_TOOL=$${LREL_TOOL}-qt5
for(bin, PATHS): exists($${bin}/$${LREL_TOOL}-qt5): LREL_TOOL=$${bin}/$${LREL_TOOL}-qt5
} else {
exists($${LREL_TOOL}-qt4): LREL_TOOL=$${LREL_TOOL}-qt4
for(bin, PATHS): exists($${bin}/$${LREL_TOOL}-qt4): LREL_TOOL=$${bin}/$${LREL_TOOL}-qt4
}
# Translations

View File

@ -13,9 +13,9 @@ UI_DIR = $$CONFIG_DIR/.ui/$$TARGET
P = $$_PRO_FILE_PWD_/..
INCLUDEPATH += $$P/ext/zlib $$P/Common
exists($$P/.git): GIT_VERSION = '\\"$$system(git describe --always)\\"'
isEmpty(GIT_VERSION): GIT_VERSION = '\\"$$VERSION\\"'
DEFINES += PPSSPP_GIT_VERSION=\"$$GIT_VERSION\"
exists($$P/.git): GIT_VERSION = $$system(git describe --always)
isEmpty(GIT_VERSION): GIT_VERSION = $$VERSION
DEFINES += PPSSPP_GIT_VERSION=$$shell_quote(\"$$GIT_VERSION\")
win32-msvc* {
QMAKE_CXXFLAGS_RELEASE += /O2 /arch:SSE2 /fp:fast