diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-06-19 16:35:59 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-25 09:18:17 +0200 |
| commit | 7090d4a4584bcde41e2156ed155127165af42e49 (patch) | |
| tree | e0f7bde36c2beacd5b115699d0a45ae0b5becfb4 | |
| parent | d0e82ede558b4c7b0f1a89b28a224cf77a3fc068 (diff) | |
| download | qtbase-7090d4a4584bcde41e2156ed155127165af42e49.tar.gz | |
un-nest conditionals
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>
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 1d34ad5d63..d58421ea59 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -75,15 +75,13 @@ defineTest(qtAddModule) { } unset(LINKAGE) - mac { - contains(MODULE_CONFIG, lib_bundle) { + mac:contains(MODULE_CONFIG, lib_bundle) { FRAMEWORK_INCLUDE = $${MODULE_LIBS}/$${MODULE_NAME}.framework/Headers !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) { INCLUDEPATH *= $$FRAMEWORK_INCLUDE } QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS} LINKAGE += -framework $${MODULE_NAME}$${QT_LIBINFIX} - } } # Re-insert the major version in the library name (cf qtLibraryTarget above) |