From 36270e45058b84c2fc3cb9683278983eedea3a1b Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 19 Nov 2012 10:19:57 +0100 Subject: 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 --- qmake/generators/win32/mingw_make.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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::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) || -- cgit v1.2.3