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

fix the determination whether to build a module as a framework

Browse Source 
CONFIG+=qt_framework is actually put into qconfig.pri, so it's always
set in framework builds. things (sometimes) worked only by virtue of the
qt_framework checks being in "else" branches of "static" checks. use
lib_bundle instead, which triggers the actual framework build anyway.

amends b72d1db44.

Change-Id: Ib725c43476d9fb38bad940ce09905d29ff3edfa3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-11-19 16:50:16 +01:00
parent dc3e7e45eb
commit 2e6754d942
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mkspecs/features/qt_module.prf
View File

@ -43,7 +43,7 @@ host_build {
} }
mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework): \ mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework): \
CONFIG += qt_framework CONFIG += lib_bundle
CONFIG += relative_qt_rpath # Qt libraries should be relocatable CONFIG += relative_qt_rpath # Qt libraries should be relocatable
@ -106,7 +106,7 @@ else: \
DEFINES += QT_BUILD_$${ucmodule}_LIB DEFINES += QT_BUILD_$${ucmodule}_LIB
# OS X and iOS frameworks # OS X and iOS frameworks
qt_framework { lib_bundle {
# Set the CFBundleIdentifier prefix for Qt frameworks # Set the CFBundleIdentifier prefix for Qt frameworks
QMAKE_TARGET_BUNDLE_PREFIX = org.qt-project QMAKE_TARGET_BUNDLE_PREFIX = org.qt-project
#QMAKE_FRAMEWORK_VERSION = 4.0 #QMAKE_FRAMEWORK_VERSION = 4.0
@ -115,8 +115,6 @@ qt_framework {
CONFIG += bundle CONFIG += bundle
QMAKE_BUNDLE_EXTENSION = .framework QMAKE_BUNDLE_EXTENSION = .framework
QMAKE_INFO_PLIST = $$QMAKESPEC/Info.plist.lib QMAKE_INFO_PLIST = $$QMAKESPEC/Info.plist.lib
} else {
CONFIG += lib_bundle
} }
CONFIG -= qt_install_headers #no need to install these as well CONFIG -= qt_install_headers #no need to install these as well
!debug_and_release|!build_all|CONFIG(release, debug|release) { !debug_and_release|!build_all|CONFIG(release, debug|release) {
@ -239,7 +237,7 @@ load(qt_installs)
load(qt_targets) load(qt_targets)
# this builds on top of qt_common # this builds on top of qt_common
!internal_module:!qt_framework:if(unix|mingw) { !internal_module:!lib_bundle:if(unix|mingw) {
CONFIG += create_pc CONFIG += create_pc
QMAKE_PKGCONFIG_DESTDIR = pkgconfig QMAKE_PKGCONFIG_DESTDIR = pkgconfig
host_build: \ host_build: \

2
mkspecs/features/qt_module_pris.prf
View File

@ -55,7 +55,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
module_rundep = module_rundep =
static: \ static: \
module_build_type = staticlib module_build_type = staticlib
else: qt_framework: \ else: lib_bundle: \
module_build_type = lib_bundle module_build_type = lib_bundle
else: \ else: \
module_build_type = module_build_type =