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>

4 files changed, 17 insertions, 15 deletions

diff --git a/configure.pri b/configure.pri
index 76438f2c20..7625074c50 100644
--- a/configure.pri
+++ b/configure.pri
@@ -584,16 +584,15 @@ defineTest(qtConfOutput_compilerFlags) {
         output += "EXTRA_INCLUDEPATH += $$config.input.includes"
     }
 
-    libs = $$join(config.input.lpaths, " -L", "-L")
-
-    darwin: \
-        libs += $$join(config.input.fpaths, " -F", "-F")
-
-    !isEmpty(libs) {
-        EXTRA_LIBS += $$libs
-        export(EXTRA_LIBS)
-
-        output += "EXTRA_LIBS += $$libs"
+    !isEmpty(config.input.lpaths) {
+        EXTRA_LIBDIR += $$config.input.lpaths
+        export(EXTRA_LIBDIR)
+        output += "EXTRA_LIBDIR += $$config.input.lpaths"
+    }
+    darwin:!isEmpty(config.input.fpaths) {
+        EXTRA_FRAMEWORKPATH += $$config.input.fpaths
+        export(EXTRA_FRAMEWORKPATH)
+        output += "EXTRA_FRAMEWORKPATH += $$config.input.fpaths"
     }
 
     config.output.privatePro += $$output
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
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 3adf54cb04..f3892254a5 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -903,7 +903,7 @@ void Configure::parseCmdLine()
                 dictionary[ "DONE" ] = "error";
                 break;
             }
-            qmakeLibs += QString("-L" + configCmdLine.at(i));
+            qmakeLibs += configCmdLine.at(i);
         } else if (configCmdLine.at(i).startsWith("OPENSSL_LIBS=")) {
             opensslLibs = configCmdLine.at(i);
         } else if (configCmdLine.at(i).startsWith("OPENSSL_LIBS_DEBUG=")) {
@@ -2681,7 +2681,7 @@ void Configure::generateOutputVars()
         qtConfig += "accessibility";
 
     if (!qmakeLibs.isEmpty())
-        qmakeVars += "EXTRA_LIBS += " + formatPaths(qmakeLibs);
+        qmakeVars += "EXTRA_LIBDIR += " + formatPaths(qmakeLibs);
 
     if (!dictionary["QMAKE_LIBS_SQLITE"].isEmpty())
         qmakeVars += "QMAKE_LIBS_SQLITE += " + dictionary["QMAKE_LIBS_SQLITE"];