summaryrefslogtreecommitdiffstats
path: root/qmake/generators/win32/mingw_make.h
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-09-23 14:57:05 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-10-02 14:01:24 +0000
commit4bb004de94380304d8950e860d1823975927ec59 (patch)
treeac60a500a31aab3993808f15c1731d740170dc51 /qmake/generators/win32/mingw_make.h
parentdd9ec15640fb48fc27011b8f9420411a1637a203 (diff)
merge MingwMakefileGenerator::findLibraries() into Win32MakefileGenerator
as a side effect, this makes the extensions used for searching libraries configurable under windows (QMAKE_LIB_EXTENSIONS). Change-Id: I3e64304fcadbfe74d601b50a70a73180c894503e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake/generators/win32/mingw_make.h')
-rw-r--r--qmake/generators/win32/mingw_make.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h
index 9a30bc8ea6..4e94a23ae2 100644
--- a/qmake/generators/win32/mingw_make.h
+++ b/qmake/generators/win32/mingw_make.h
@@ -62,7 +62,7 @@ private:
QString preCompHeaderOut;
- virtual bool findLibraries(bool linkPrl, bool mergeLflags);
+ virtual LibFlagType parseLibFlag(const ProString &flag, ProString *arg);
QString objectsLinkLine;
};