Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
  Provide overview for Symbian capabilities.
  Fix QNX screen initialization
  tst_qftp: Attempting to reproduce a crash
  QNAM HTTP: Do not pipeline with WebLogic servers
  Autotest: update path location on the test server
  Autotest: update location of fluke.gif on test server
  Make qsTr work in global scope
  Not possible to show selected text in virtual keyboard
  Fix typos, there is no QT_NO_SSL
  Export .flm files always if they are different
  Make qmake possible to build with mingw using qmake.pro
  QS60Style: Single Click UI support for SD 9.2 time-box

2 files changed, 2 insertions, 1 deletions

diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index c817056..3a6706a 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -75,7 +75,7 @@ void SymbianSbsv2MakefileGenerator::exportFlm()
 
         foreach(QFileInfo item, sourceInfos) {
             QFileInfo destInfo = QFileInfo(destDir.absolutePath() + "/" + item.fileName());
-            if (!destInfo.exists() || destInfo.lastModified() < item.lastModified()) {
+            if (!destInfo.exists() || destInfo.lastModified() != item.lastModified()) {
                 if (destInfo.exists())
                     QFile::remove(destInfo.absoluteFilePath());
                 if (QFile::copy(item.absoluteFilePath(), destInfo.absoluteFilePath()))
diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index 281417c..0163839 100644
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -132,6 +132,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
     }
 
     qnx {