diff options
Diffstat (limited to 'qmake/generators/win32/mingw_make.cpp')
-rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index bbb9dc2bac..6e0f41f479 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -73,13 +73,6 @@ QString MingwMakefileGenerator::getLibTarget() bool MingwMakefileGenerator::findLibraries() { - return findLibraries("QMAKE_LIBS") && findLibraries("QMAKE_LIBS_PRIVATE"); -} - -bool MingwMakefileGenerator::findLibraries(const QString &where) -{ - QStringList &l = project->values(where); - QList<QMakeLocalFileName> dirs; { const QStringList &libpaths = project->values("QMAKE_LIBDIR"); @@ -88,6 +81,9 @@ bool MingwMakefileGenerator::findLibraries(const QString &where) 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]); QStringList::Iterator it = l.begin(); while (it != l.end()) { if ((*it).startsWith("-l")) { @@ -116,6 +112,7 @@ bool MingwMakefileGenerator::findLibraries(const QString &where) ++it; } + } return true; } |