From e5b203dbc7da249e89cc800a7b6a41af8b913ecc Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 12 Jul 2012 21:46:53 +0200 Subject: dispose of MSVCPROJ_LIBS this way QMAKE_LIBS{,_PRIVATE} can be treated the same as in all other generators, which allows us to: - make the windows generators' findLibraries() be more like the unix version - dispose of QMAKE_INTERNAL_PRL_LIBS handling while reading prl files (because the output always goes to QMAKE_LIBS) - as a side effect, QMAKE_LIBS_PRIVATE are not subjected to prl file resolution any more, which is again consistent with unix - the correctness of that needs to be assessed separately. Change-Id: Ie9bc04d117eff6a7cde846677f98acf3c64aa6ee Reviewed-by: Friedemann Kleint --- qmake/generators/win32/winmakefile.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'qmake/generators/win32/winmakefile.cpp') diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 2aafa0a3d6..2af7b811dd 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -104,9 +104,8 @@ Win32MakefileGenerator::findHighestVersion(const QString &d, const QString &stem } bool -Win32MakefileGenerator::findLibraries(const QString &where) +Win32MakefileGenerator::findLibraries() { - QStringList &l = project->values(where); QList dirs; { const QStringList &libpaths = project->values("QMAKE_LIBDIR"); @@ -114,6 +113,9 @@ Win32MakefileGenerator::findLibraries(const QString &where) libpathit != libpaths.end(); ++libpathit) dirs.append(QMakeLocalFileName((*libpathit))); } + const QString lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", QString() }; + for (int i = 0; !lflags[i].isNull(); i++) { + QStringList &l = project->values(lflags[i]); for(QStringList::Iterator it = l.begin(); it != l.end();) { QChar quote; bool modified_opt = false, remove = false; @@ -213,6 +215,7 @@ Win32MakefileGenerator::findLibraries(const QString &where) ++it; } } + } return true; } @@ -229,10 +232,7 @@ Win32MakefileGenerator::processPrlFiles() for(bool ret = false; true; ret = false) { //read in any prl files included.. QStringList l_out; - QString where = "QMAKE_LIBS"; - if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS")) - where = project->first("QMAKE_INTERNAL_PRL_LIBS"); - QStringList l = project->values(where); + QStringList l = project->values("QMAKE_LIBS"); for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) { QString opt = (*it).trimmed(); if((opt[0] == '\'' || opt[0] == '"') && opt[(int)opt.length()-1] == opt[0]) -- cgit v1.2.3