Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (62 commits)
  Use native locale aware string comparison on Symbian.
  Temporary fix for regression in QSslCertificate::fromPath()
  doc: Added more DITA output to the XML generator
  Fix symbian building of TARGET with a slash
  Fix a minor typo in QAbstractItemModel's documentation.
  QXmlSchema: allow usage of xsd:all
  QSslSocket: fix build for MinGW and VS 2005
  Fix symbian-abld build failure with bearer plugins
  remove certificate bundle
  make QSslSocket::systemCaCertificates() use system certs
  Adjusted RegExp in QSslCertificate::fromPath()
  Fix QSystemTrayIcon::supportsMessages() on Windows
  Use NIM_SETVERSION to get the latest behavior
  Cleanup obsolete stuff
  doc: Added DITA XML generator
  Fixed a broken merge.
  Changed the way we detect touch screen on Windows.
  Fixed error deploying qsymbianbearer.qtplugin on Symbian.
  Revert "Attempt to fix build failure on Symbian."
  Attempt to fix build failure on Symbian.
  ...

3 files changed, 17 insertions, 3 deletions

diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index ad8750b..e98831d 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -529,9 +529,18 @@ MetaMakefileGenerator::modesForGenerator(const QString &gen,
         *host_mode = Option::HOST_UNIX_MODE;
         *target_mode = Option::TARG_UNIX_MODE;
 #endif
-    } else if (gen == "MSVC.NET" || gen == "MINGW" || gen == "BMAKE" || gen == "MSBUILD") {
+    } else if (gen == "MSVC.NET" || gen == "BMAKE" || gen == "MSBUILD") {
         *host_mode = Option::HOST_WIN_MODE;
         *target_mode = Option::TARG_WIN_MODE;
+    } else if (gen == "MINGW") {
+#if defined(Q_OS_MAC)
+        *host_mode = Option::HOST_MACX_MODE;
+#elif defined(Q_OS_UNIX)
+        *host_mode = Option::HOST_UNIX_MODE;
+#else
+        *host_mode = Option::HOST_WIN_MODE;
+#endif
+        *target_mode = Option::TARG_WIN_MODE;
     } else if (gen == "PROJECTBUILDER" || gen == "XCODE") {
         *host_mode = Option::HOST_MACX_MODE;
         *target_mode = Option::TARG_MACX_MODE;
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 0936d15..5685d6b 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -371,7 +371,12 @@ void MingwMakefileGenerator::writeObjectsPart(QTextStream &t)
 	    ar_script_file += "." + var("BUILD_NAME");
 	}
 	createArObjectScriptFile(ar_script_file, var("DEST_TARGET"), project->values("OBJECTS"));
-        objectsLinkLine = "ar -M < " + ar_script_file;
+        // QMAKE_LIB is used for win32, including mingw, whereas QMAKE_AR is used on Unix.
+        // Strip off any options since the ar commands will be read from file.
+        QString ar_cmd = var("QMAKE_LIB").section(" ", 0, 0);;
+        if (ar_cmd.isEmpty())
+            ar_cmd = "ar";
+        objectsLinkLine = ar_cmd + " -M < " + ar_script_file;
     } else {
         QString ld_script_file = var("QMAKE_LINK_OBJECT_SCRIPT") + "." + var("TARGET");
 	if (!var("BUILD_NAME").isEmpty()) {
diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index 6e0f8a2..a7e0ab1 100644
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -134,7 +134,7 @@ bootstrap { #Qt code
     } else:win32 {
 	SOURCES += qfsfileengine_win.cpp qfsfileengine_iterator_win.cpp qsettings_win.cpp
         win32-msvc*:LIBS += ole32.lib advapi32.lib
-        win32-g++:LIBS += -lole32 -luuid
+        win32-g++*:LIBS += -lole32 -luuid
     }
 
     qnx {