1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delay application of -D/-I/-L/-l on windows as well

Browse Source 
clearly, "the windows configure does not have any of this magic to start
with" was flat-out wrong.

Task-number: QTBUG-53312
Change-Id: I80ac10bc8b1581e61c57fcd97f25626990d120ec
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2016-05-17 10:45:43 +02:00 committed by Simon Hausmann
parent 6086c81e4d
commit eff3a7ded1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/configure/configureapp.cpp
View File

@ -2987,7 +2987,7 @@ void Configure::generateOutputVars()
qtConfig += "accessibility";
if (!qmakeLibs.isEmpty())
qmakeVars += "LIBS += " + formatPaths(qmakeLibs);
qmakeVars += "EXTRA_LIBS += " + formatPaths(qmakeLibs);
if (!dictionary["QT_LFLAGS_SQLITE"].isEmpty())
qmakeVars += "QT_LFLAGS_SQLITE += " + dictionary["QT_LFLAGS_SQLITE"];
@ -3105,9 +3105,9 @@ void Configure::generateOutputVars()
qtConfig += "rpath";
if (!qmakeDefines.isEmpty())
qmakeVars += QString("DEFINES += ") + qmakeDefines.join(' ');
qmakeVars += QString("EXTRA_DEFINES += ") + qmakeDefines.join(' ');
if (!qmakeIncludes.isEmpty())
qmakeVars += QString("INCLUDEPATH += ") + formatPaths(qmakeIncludes);
qmakeVars += QString("EXTRA_INCLUDEPATH += ") + formatPaths(qmakeIncludes);
if (!opensslLibs.isEmpty())
qmakeVars += opensslLibs;
if (dictionary[ "OPENSSL" ] == "linked") {