diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-08 09:56:39 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-11 00:41:07 +0200 |
commit | 0fc4f2b4cfc940a899578990a664ece874aa3a84 (patch) | |
tree | 9734e84dfc7163c6e04a707d60cfe721a1cd6a97 | |
parent | 6f4ff81380862ad0e788151b35d742f548241d5a (diff) |
qtAddModule(): put search paths directly into LIBS{,_PRIVATE}
QMAKE_LIBDIR and QMAKE_FRAMEWORKPATH have the downside that they
always effectively end up in LIBS, which makes for weird prl files.
Change-Id: Iaf61b0038504ff91ae5ec7f9b1255fe3a2d134f1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r-- | mkspecs/features/qt_functions.prf | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 82916ffd67..06389fa7a5 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -63,11 +63,14 @@ defineTest(qtAddModule) { unset(LINKAGE) mac { !contains(MODULE_CONFIG,staticlib):CONFIG(qt_framework, qt_framework|qt_no_framework) { #forced - QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS} 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 - LINKAGE = -framework $${MODULE_NAME}$${QT_LIBINFIX} + LINKAGE = -F$${MODULE_LIBS} + } else { + QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS} + } + LINKAGE += -framework $${MODULE_NAME}$${QT_LIBINFIX} } } @@ -83,17 +86,19 @@ defineTest(qtAddModule) { isEmpty(LINKAGE) { !isEmpty(MODULE_LIBS) { - QMAKE_LIBDIR *= $$MODULE_LIBS + LINKAGE = -L$$MODULE_LIBS !isEqual(MODULE_LIBS, $$[QT_INSTALL_LIBS]) { # Make sure we can link to uninstalled libraries unix:!mac:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS" } } + lib = if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { - win32:LINKAGE = -l$${MODULE_NAME}$${QT_LIBINFIX}d - mac:LINKAGE = -l$${MODULE_NAME}$${QT_LIBINFIX}_debug + win32: lib = -l$${MODULE_NAME}$${QT_LIBINFIX}d + mac: lib = -l$${MODULE_NAME}$${QT_LIBINFIX}_debug } - isEmpty(LINKAGE):LINKAGE = -l$${MODULE_NAME}$${QT_LIBINFIX} + isEmpty(lib): lib = -l$${MODULE_NAME}$${QT_LIBINFIX} + LINKAGE += $$lib } # Only link to this module if a libs directory is set, else this is just a module # to give access to sources or include files, and not for linking. |