remove QTDLL_POSTFIX stuff

the libinfix provides a way cleaner solution to that. i don't expect it
to be still actually used anyway.

Change-Id: I051522ec3abb3d92c529b5462b8514a706aa2ba1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index 8be2fcf..2aafa0a 100644 (file)
--- 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()) {

diff --git a/qmake/generators/win32/winmakefile.h b/qmake/generators/win32/winmakefile.h
index 9fd4f90..c0ea52c 100644 (file)
--- a/qmake/generators/win32/winmakefile.h
+++ b/qmake/generators/win32/winmakefile.h
@@ -46,14 +46,6 @@
 
 QT_BEGIN_NAMESPACE
 
-// In the Qt evaluation and educational version, we have a postfix in the
-// library name (e.g. qtmteval301.dll). QTDLL_POSTFIX is used for this.
-// A script modifies these lines when building eval/edu version, so be careful
-// when changing them.
-#ifndef QTDLL_POSTFIX
-#define QTDLL_POSTFIX ""
-#endif
-
 class Win32MakefileGenerator : public MakefileGenerator
 {
 public: