diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-06-18 14:16:32 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-20 22:56:20 +0200 |
| commit | ca06fcfb43e15041c530c79bcb427377a5f409d1 (patch) | |
| tree | 46ea7a0ca8d2f7c2b2d240a997d296d5f0aa94c4 /mkspecs | |
| parent | b4c0d9166e7a8f5dfa5ca052002a5ab318787aa2 (diff) | |
don't include non-framework include paths when using frameworks
Change-Id: Ia72d5b611b9870b83846299bc7642841b09b84b1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 2f2c94ce06..f055be72a8 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -71,11 +71,6 @@ defineTest(qtAddModule) { MODULE_LIBS_ADD = $$MODULE_LIBS MODULE_LIBS_ADD -= $$QMAKE_DEFAULT_LIBDIRS - INCLUDEPATH *= $$MODULE_INCLUDES - auto_use_privates|isEqual(2, UsePrivate) { # Tests function parameter 2 ($$2) being equal to 'UsePrivate' - INCLUDEPATH += $$eval(QT.$${1}.private_includes) - } - unset(LINKAGE) mac:contains(MODULE_CONFIG, lib_bundle) { FRAMEWORK_INCLUDE = $${MODULE_LIBS}/$${MODULE_NAME}.framework/Headers @@ -88,6 +83,10 @@ defineTest(qtAddModule) { $$FRAMEWORK_INCLUDE/$$eval(QT.$${1}.VERSION)/$$MODULE_NAME QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS} LINKAGE += -framework $${MODULE_NAME}$${QT_LIBINFIX} + } else { + INCLUDEPATH *= $$MODULE_INCLUDES + auto_use_privates|isEqual(2, UsePrivate): \ + INCLUDEPATH += $$eval(QT.$${1}.private_includes) } # Re-insert the major version in the library name (cf qtLibraryTarget above) |