diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-07-07 13:47:49 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-07-13 19:51:34 +0000 |
| commit | 4cb3c3e15aba83a32f5b4ddcf4561bc231aa4dc2 (patch) | |
| tree | 19c890f9636a243e0705b2002b21817c02e65dd3 /mkspecs | |
| parent | 6f1ad48a9115ff415b0496927451d0f7f5ea284c (diff) | |
Replace EXTRA_LIBS with EXTRA_LIBDIR and EXTRA_FRAMEWORKPATH
Now that -l and -fw options are gone, using a combined EXTRA_LIBS
makes no sense anymore and only complicates things.
Change-Id: Ic12bf482f3bed041aff7f0891f008b1f34ae2b4d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_build_extra.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mkspecs/features/qt_build_extra.prf b/mkspecs/features/qt_build_extra.prf index 378f5bbd7c..448da9b797 100644 --- a/mkspecs/features/qt_build_extra.prf +++ b/mkspecs/features/qt_build_extra.prf @@ -23,7 +23,8 @@ INCLUDEPATH += $$EXTRA_INCLUDEPATH # The other flags are relevant only for actual libraries. equals(TEMPLATE, aux): return() -LIBS += $$EXTRA_LIBS +QMAKE_LIBDIR += $$EXTRA_LIBDIR +QMAKE_FRAMEWORKPATH += $$EXTRA_FRAMEWORKPATH # Static libs need no rpaths static: return() diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 87ec04e5fb..2127b1ed37 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -404,8 +404,10 @@ defineTest(qtConfTest_compile) { # add compiler flags, these are set for the target and should not be applied to host tests !isEmpty(EXTRA_DEFINES): \ qmake_args += "\"DEFINES += $$EXTRA_DEFINES\"" - !isEmpty(EXTRA_LIBS) \ - qmake_args += "\"LIBS += $$EXTRA_LIBS\"" + !isEmpty(EXTRA_LIBDIR) \ + qmake_args += "\"QMAKE_LIBDIR += $$EXTRA_LIBDIR\"" + !isEmpty(EXTRA_FRAMEWORKPATH) \ + qmake_args += "\"QMAKE_FRAMEWORKPATH += $$EXTRA_FRAMEWORKPATH\"" !isEmpty(EXTRA_INCLUDEPATH): \ qmake_args += "\"INCLUDEPATH += $$EXTRA_INCLUDEPATH\"" qmake_args += $$EXTRA_QMAKE_ARGS |