diff options
Diffstat (limited to 'qmake/generators/win32/winmakefile.cpp')
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 8be2fcf7e0..2aafa0a3d6 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -64,9 +64,8 @@ Win32MakefileGenerator::findHighestVersion(const QString &d, const QString &stem if(!exists(bd)) return -1; - QString dllStem = stem + QTDLL_POSTFIX; QMakeMetaInfo libinfo; - bool libInfoRead = libinfo.readLib(bd + Option::dir_sep + dllStem); + bool libInfoRead = libinfo.readLib(bd + Option::dir_sep + stem); // If the library, for which we're trying to find the highest version // number, is a static library @@ -86,7 +85,7 @@ Win32MakefileGenerator::findHighestVersion(const QString &d, const QString &stem dirEntryListCache.insert(bd, entries); } - QRegExp regx(QString("((lib)?%1([0-9]*)).(%2|prl)$").arg(dllStem).arg(ext), Qt::CaseInsensitive); + QRegExp regx(QString("((lib)?%1([0-9]*)).(%2|prl)$").arg(stem).arg(ext), Qt::CaseInsensitive); for(QStringList::Iterator it = entries.begin(); it != entries.end(); ++it) { if(regx.exactMatch((*it))) { if (!regx.cap(3).isEmpty()) { |