Merge remote-tracking branch 'origin/5.6' into dev

Conflicts:
	tests/auto/corelib/io/qfile/tst_qfile.cpp
	tests/auto/corelib/io/qprocess/tst_qprocess.cpp
	tests/auto/corelib/tools/qversionnumber/qversionnumber.pro

Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e

1 files changed, 2 insertions, 4 deletions

diff --git a/qmake/generators/win32/winmakefile.h b/qmake/generators/win32/winmakefile.h
index ea763c3175..54c4d3be53 100644
--- a/qmake/generators/win32/winmakefile.h
+++ b/qmake/generators/win32/winmakefile.h
@@ -57,16 +57,14 @@ protected:
 
     virtual void writeRcFilePart(QTextStream &t);
 
-    int findHighestVersion(const QString &dir, const QString &stem, const QString &ext = QLatin1String("lib"));
-    virtual bool findLibraries();
+    virtual bool findLibraries(bool linkPrl, bool mergeLflags);
 
+    virtual LibFlagType parseLibFlag(const ProString &flag, ProString *arg);
     virtual ProString fixLibFlag(const ProString &lib);
 
-    virtual void processPrlFiles();
     void processVars();
     void fixTargetExt();
     void processRcFileVar();
-    virtual QString getLibTarget();
     static QString cQuoted(const QString &str);
     virtual QString getManifestFileForRcFile() const;
 };