TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #268 from Skycoder42/master

Browse Source 
Fixed shadowed build (fixes #267)
This commit is contained in:
TheAssassin
2018-04-08 16:59:47 +02:00
committed by GitHub
parent 9be9afce23 4830aa2490
commit 88aba55163
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/linuxdeployqt/linuxdeployqt.pro
+5 -5
View File
@@ -12,7 +12,7 @@ load(qt_tool)
HEADERS += shared.h HEADERS += shared.h
SOURCES += main.cpp \ SOURCES += main.cpp \
shared.cpp shared.cpp
DEFINES -= QT_USE_QSTRINGBUILDER #leads to compile errors if not disabled DEFINES -= QT_USE_QSTRINGBUILDER #leads to compile errors if not disabled
@@ -20,19 +20,19 @@ DEFINES -= QT_USE_QSTRINGBUILDER #leads to compile errors if not disabled
# don't break the quotes -- at the moment, the shell commands are injected into the Makefile to have them run on every # don't break the quotes -- at the moment, the shell commands are injected into the Makefile to have them run on every
# build and not during configure time # build and not during configure time
DEFINES += LINUXDEPLOYQT_GIT_COMMIT="'\"$(shell git rev-parse --short HEAD)\"'" DEFINES += LINUXDEPLOYQT_GIT_COMMIT="'\"$(shell cd $$PWD && git rev-parse --short HEAD)\"'"
DEFINES += BUILD_DATE="'\"$(shell env LC_ALL=C date -u '+%Y-%m-%d %H:%M:%S %Z')\"'" DEFINES += BUILD_DATE="'\"$(shell env LC_ALL=C date -u '+%Y-%m-%d %H:%M:%S %Z')\"'"
_BUILD_NUMBER = $$(TRAVIS_BUILD_NUMBER) _BUILD_NUMBER = $$(TRAVIS_BUILD_NUMBER)
isEmpty(_BUILD_NUMBER) { isEmpty(_BUILD_NUMBER) {
message(Not building on Travis CI, tagging build as local dev build) message("Not building on Travis CI, tagging build as local dev build")
DEFINES += BUILD_NUMBER="'\"<local dev build>\"'" DEFINES += BUILD_NUMBER="'\"<local dev build>\"'"
} else { } else {
message(Building on Travis CI build, build number $$_BUILD_NUMBER) message("Building on Travis CI build, build number $$_BUILD_NUMBER")
DEFINES += BUILD_NUMBER="'\"$$_BUILD_NUMBER\"'" DEFINES += BUILD_NUMBER="'\"$$_BUILD_NUMBER\"'"
} }
DEFINES += LINUXDEPLOYQT_VERSION="'\"$(shell git describe --tags $(shell git rev-list --tags --skip=1 --max-count=1) --abbrev=0)\"'" DEFINES += LINUXDEPLOYQT_VERSION="'\"$(shell cd $$PWD && git describe --tags $(shell cd $$PWD && git rev-list --tags --skip=1 --max-count=1) --abbrev=0)\"'"
DEFINES += EXCLUDELIST=\""$$system($$_PRO_FILE_PWD_/../excludelist.sh)"\" DEFINES += EXCLUDELIST=\""$$system($$_PRO_FILE_PWD_/../excludelist.sh)"\"