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: (69 commits)
  re-add overriding of tool paths to configure
  fix regexp
  Support linked fonts (.ltt) from standard font locations.
  fix path separators in install targets for MinGW+sh
  fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
  define qtPrepareTool() function and use it throughout
  QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike
  QNAM HTTP: And one more testcase
  QNetworkAccessManager: Backends were tried in wrong order
  Fix QUrl::isValid if the host contains invalid caracter.
  Fix anomaly demo control strip icon placement
  QUrl: parsing of host name with an undercore.
  Fixed race condition compiling xmlpatterns tests.
  Remove qdbusserver from tests/auto/dbus.pro
  QNAM HTTP: Preemptive anti crash if() statement
  QNAM HTTP: More testcases
  Fixing compiling issues.
  Remove garbage test.
  OpenVG blending modes from VG_KHR_advanced_blending extension
  Fix spurious mouse click when dismissing a native menu
  ...

1 files changed, 11 insertions, 2 deletions

diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp
index 46de9ef..c1223af 100644
--- a/src/gui/styles/qs60style_s60.cpp
+++ b/src/gui/styles/qs60style_s60.cpp
@@ -654,6 +654,14 @@ QPixmap QS60StyleModeSpecifics::fromFbsBitmap(CFbsBitmap *icon, CFbsBitmap *mask
 
         pixmap = QPixmap::fromImage(iconImage);
     }
+    if ((flags & QS60StylePrivate::SF_Mirrored_X_Axis) ||
+        (flags & QS60StylePrivate::SF_Mirrored_Y_Axis)) {
+        QImage iconImage = pixmap.toImage().mirrored(
+            flags & QS60StylePrivate::SF_Mirrored_X_Axis,
+            flags & QS60StylePrivate::SF_Mirrored_Y_Axis);
+        pixmap = QPixmap::fromImage(iconImage);
+    }
+
     return pixmap;
 }
 
@@ -969,7 +977,7 @@ void QS60StyleModeSpecifics::frameIdAndCenterId(QS60StylePrivate::SkinFrameEleme
 
     switch(frameElement) {
         case QS60StylePrivate::SF_ToolTip:
-            if (QSysInfo::s60Version()!=QSysInfo::SV_S60_3_1) {
+            if (QSysInfo::s60Version() != QSysInfo::SV_S60_3_1) {
                 centerId.Set(EAknsMajorGeneric, 0x19c2);
                 frameId.Set(EAknsMajorSkin, 0x5300);
             } else {
@@ -978,7 +986,8 @@ void QS60StyleModeSpecifics::frameIdAndCenterId(QS60StylePrivate::SkinFrameEleme
             }
             break;
         case QS60StylePrivate::SF_ToolBar:
-            if (QSysInfo::s60Version()==QSysInfo::SV_S60_3_1 || QSysInfo::s60Version()==QSysInfo::SV_S60_3_2) {
+            if (QSysInfo::s60Version() == QSysInfo::SV_S60_3_1 || 
+                QSysInfo::s60Version() == QSysInfo::SV_S60_3_2) {
                 centerId.Set(KAknsIIDQsnFrPopupCenterSubmenu);
                 frameId.Set(KAknsIIDQsnFrPopupSub);
             }