summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2012-11-19 10:19:57 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-19 13:35:27 +0100
commit36270e45058b84c2fc3cb9683278983eedea3a1b (patch)
tree85b2dce03ac1be374eb895e86ac44058777e9d61 /qmake
parentcfa0f3bd5673c54981383557cac863e44c8d40a7 (diff)
MinGW: Don't add version number '0' to the library name
This fixes linking on MinGW after the library renaming, and is also in line with the logic in the nmake generator. Change-Id: Ie25ce6c1d2b8f292c4e454db1cad9bcbbee7a05d Suggested-by: Erik van Pienbroek Task-number: QTBUG-27137 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/win32/mingw_make.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index bc0f82e9f2..7990986fd8 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -89,7 +89,7 @@ bool MingwMakefileGenerator::findLibraries()
for (QList<QMakeLocalFileName>::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) {
QString extension;
int ver = findHighestVersion((*dir_it).local(), steam, "dll.a|a");
- if (ver != -1)
+ if (ver > 0)
extension += QString::number(ver);
extension += suffix;
if(QMakeMetaInfo::libExists((*dir_it).local() + Option::dir_sep + steam) ||