From 4cb3c3e15aba83a32f5b4ddcf4561bc231aa4dc2 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 7 Jul 2016 13:47:49 +0200 Subject: 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 --- tools/configure/configureapp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/configure') 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"]; -- cgit v1.2.3