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

clean up fixTargetExt()

Browse Source 
there doesn't appear to be a point in having the function virtual; the
part in the mingw generator can be inlined somewhere else just fine.

Change-Id: I50d66d505095b43fce601928c6240a684389a4b7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-07-16 13:02:57 +02:00 committed by Qt by Nokia
parent a102f1abf2
commit b053aaa9ef
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qmake/generators/win32/mingw_make.cpp
View File

@ -290,6 +290,9 @@ void MingwMakefileGenerator::init()
project->values("QMAKE_LFLAGS").append(QString("-Wl,") + escapeFilePath(defFileName));
}
if (project->isActiveConfig("staticlib") && project->first("TEMPLATE") == "lib")
project->values("QMAKE_LFLAGS").append("-static");
MakefileGenerator::init();
// precomp
@ -320,14 +323,6 @@ void MingwMakefileGenerator::init()
}
}
void MingwMakefileGenerator::fixTargetExt()
{
if (project->isActiveConfig("staticlib") && project->first("TEMPLATE") == "lib") {
project->values("QMAKE_LFLAGS").append("-static");
}
Win32MakefileGenerator::fixTargetExt();
}
void MingwMakefileGenerator::writeIncPart(QTextStream &t)
{
t << "INCPATH = ";

1
qmake/generators/win32/mingw_make.h
View File

@ -70,7 +70,6 @@ private:
QString preCompHeaderOut;
virtual bool findLibraries();
void fixTargetExt();
bool init_flag;
QString objectsLinkLine;

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

@ -70,7 +70,7 @@ protected:
virtual void processPrlFiles();
void processVars();
virtual void fixTargetExt();
void fixTargetExt();
void processRcFileVar();
void processFileTagsVar();
virtual QString getLibTarget();