AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove QTDLL_POSTFIX stuff

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-07-12 16:49:02 +02:00 committed by Qt by Nokia
parent 2d04ea0f61
commit a89bd2d2fb
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qmake/generators/win32/winmakefile.cpp
View File

@ -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()) {

8
qmake/generators/win32/winmakefile.h
View File

@ -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: