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

remove redundant "mac" checks

Browse Source 
qt_framework and {app,lib}_bundle imply darwin, so there is no point in
testing for it.

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

4
mkspecs/features/qt.prf
View File

@ -89,7 +89,7 @@ for(ever) {
MODULE_LIBS_ADD -= $$QMAKE_DEFAULT_LIBDIRS MODULE_LIBS_ADD -= $$QMAKE_DEFAULT_LIBDIRS
LINKAGE = LINKAGE =
mac:contains(MODULE_CONFIG, lib_bundle) { contains(MODULE_CONFIG, lib_bundle) {
FRAMEWORK_INCLUDE = $${MODULE_LIBS}/$${MODULE_NAME}.framework/Headers FRAMEWORK_INCLUDE = $${MODULE_LIBS}/$${MODULE_NAME}.framework/Headers
!qt_no_framework_direct_includes { !qt_no_framework_direct_includes {
INCLUDEPATH *= $$FRAMEWORK_INCLUDE INCLUDEPATH *= $$FRAMEWORK_INCLUDE
@ -111,7 +111,7 @@ for(ever) {
# Re-insert the major version in the library name (cf qt5LibraryTarget above) # Re-insert the major version in the library name (cf qt5LibraryTarget above)
# unless it's a framework build # unless it's a framework build
!mac|!contains(MODULE_CONFIG, lib_bundle): \ !contains(MODULE_CONFIG, lib_bundle): \
MODULE_NAME ~= s,^Qt,Qt$$QT_MAJOR_VERSION, MODULE_NAME ~= s,^Qt,Qt$$QT_MAJOR_VERSION,
isEmpty(LINKAGE) { isEmpty(LINKAGE) {

2
mkspecs/features/qt_functions.prf
View File

@ -15,7 +15,7 @@ defineReplace(qtPlatformTargetSuffix) {
defineReplace(qtLibraryTarget) { defineReplace(qtLibraryTarget) {
LIBRARY_NAME = $$1 LIBRARY_NAME = $$1
mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) { CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) {
QMAKE_FRAMEWORK_BUNDLE_NAME = $$LIBRARY_NAME QMAKE_FRAMEWORK_BUNDLE_NAME = $$LIBRARY_NAME
export(QMAKE_FRAMEWORK_BUNDLE_NAME) export(QMAKE_FRAMEWORK_BUNDLE_NAME)
} }

2
mkspecs/features/qt_module.prf
View File

@ -42,7 +42,7 @@ host_build {
} }
} }
mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework): \ CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework): \
CONFIG += lib_bundle CONFIG += lib_bundle
CONFIG += relative_qt_rpath # Qt libraries should be relocatable CONFIG += relative_qt_rpath # Qt libraries should be relocatable

2
mkspecs/features/testcase.prf
View File

@ -27,7 +27,7 @@ check.commands += $(TESTRUNNER)
unix { unix {
isEmpty(TEST_TARGET_DIR): TEST_TARGET_DIR = . isEmpty(TEST_TARGET_DIR): TEST_TARGET_DIR = .
mac:app_bundle: \ app_bundle: \
check.commands += $${TEST_TARGET_DIR}/$(QMAKE_TARGET).app/Contents/MacOS/$(QMAKE_TARGET) check.commands += $${TEST_TARGET_DIR}/$(QMAKE_TARGET).app/Contents/MacOS/$(QMAKE_TARGET)
else: \ else: \
check.commands += $${TEST_TARGET_DIR}/$(QMAKE_TARGET) check.commands += $${TEST_TARGET_DIR}/$(QMAKE_TARGET)