whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Lars Knoll 2016-07-07 13:47:49 +02:00
parent 6f1ad48a91
commit 4cb3c3e15a
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.pri
View File

@ -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

3
mkspecs/features/qt_build_extra.prf
View File

@ -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()

6
mkspecs/features/qt_configure.prf
View File

@ -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

4
tools/configure/configureapp.cpp
View File

@ -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"];