AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

un-nest conditionals

Browse Source 
it's cleaner, and it makes it possible to actually have a single else
branch.

Change-Id: I5ef917b678e2bd5a2face8ee19e942e5e952aa80
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-06-19 16:35:59 +02:00 committed by The Qt Project
parent d0e82ede55
commit 7090d4a458
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mkspecs/features/qt_functions.prf
View File

@ -75,15 +75,13 @@ defineTest(qtAddModule) {
} }
unset(LINKAGE) unset(LINKAGE)
mac { 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:exists($$FRAMEWORK_INCLUDE) { !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
INCLUDEPATH *= $$FRAMEWORK_INCLUDE INCLUDEPATH *= $$FRAMEWORK_INCLUDE
} }
QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS} QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS}
LINKAGE += -framework $${MODULE_NAME}$${QT_LIBINFIX} LINKAGE += -framework $${MODULE_NAME}$${QT_LIBINFIX}
}
} }
# Re-insert the major version in the library name (cf qtLibraryTarget above) # Re-insert the major version in the library name (cf qtLibraryTarget above)