From b053aaa9efdca7830bfa9076845dd77674c4c293 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 16 Jul 2012 13:02:57 +0200
Subject: clean up fixTargetExt()

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>
---
 qmake/generators/win32/mingw_make.cpp | 11 +++--------
 qmake/generators/win32/mingw_make.h   |  1 -
 qmake/generators/win32/winmakefile.h  |  2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'qmake')

diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index b3cf598ddc..391e83c246 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -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       = ";
diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h
index d76295c3df..376eacd667 100644
--- a/qmake/generators/win32/mingw_make.h
+++ b/qmake/generators/win32/mingw_make.h
@@ -70,7 +70,6 @@ private:
     QString preCompHeaderOut;
 
     virtual bool findLibraries();
-    void fixTargetExt();
 
     bool init_flag;
     QString objectsLinkLine;
diff --git a/qmake/generators/win32/winmakefile.h b/qmake/generators/win32/winmakefile.h
index 865580b39f..12633285ff 100644
--- a/qmake/generators/win32/winmakefile.h
+++ b/qmake/generators/win32/winmakefile.h
@@ -70,7 +70,7 @@ protected:
 
     virtual void processPrlFiles();
     void processVars();
-    virtual void fixTargetExt();
+    void fixTargetExt();
     void processRcFileVar();
     void processFileTagsVar();
     virtual QString getLibTarget();
-- 
cgit v1.2.3