1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xcode: Ensure there's always a CFBundle[Short]Version[String] set

Browse Source 
Leaving it empty resulted in errors from Xcode when compiling the app.

Task-number: QTBUG-25309
Task-number: QTBUG-74872
Change-Id: I61b0f47d754c5f5b181a6f918283d990458cc78d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 1d1ed017119df2cd28a9e21aee0a8cece5282250)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Tor Arne Vestbø 2019-09-20 14:28:49 +02:00
parent 52889ded67
commit 1304b6705e
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mkspecs/features/mac/default_post.prf
View File

@ -97,21 +97,22 @@ macx-xcode {
qmake_pkginfo_typeinfo.value = "????" qmake_pkginfo_typeinfo.value = "????"
QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo
!isEmpty(VERSION) { bundle_version = $$VERSION
l = $$split(VERSION, '.') 0 0 # make sure there are at least three isEmpty(bundle_version): bundle_version = 1.0.0
VER_MAJ = $$member(l, 0, 0)
VER_MIN = $$member(l, 1, 1)
VER_PAT = $$member(l, 2, 2)
unset(l)
qmake_full_version.name = QMAKE_FULL_VERSION l = $$split(bundle_version, '.') 0 0 # make sure there are at least three
qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} VER_MAJ = $$member(l, 0, 0)
QMAKE_MAC_XCODE_SETTINGS += qmake_full_version VER_MIN = $$member(l, 1, 1)
VER_PAT = $$member(l, 2, 2)
unset(l)
qmake_short_version.name = QMAKE_SHORT_VERSION qmake_full_version.name = QMAKE_FULL_VERSION
qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
QMAKE_MAC_XCODE_SETTINGS += qmake_short_version QMAKE_MAC_XCODE_SETTINGS += qmake_full_version
}
qmake_short_version.name = QMAKE_SHORT_VERSION
qmake_short_version.value = $${VER_MAJ}.$${VER_MIN}
QMAKE_MAC_XCODE_SETTINGS += qmake_short_version
!isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) {
debug_information_format.name = DEBUG_INFORMATION_FORMAT debug_information_format.name = DEBUG_INFORMATION_FORMAT