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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Show softkeys when opening a dialog that has a fullscreen parent.
  Fixed autotests on Windows.
  QS60Style: draw QComboBox menu correctly
  Remove two compilation warnings for ARM
  QTabWidget tabs are resized in wrong way when device rotates
  Symbian: QComboBox popup Listbox size is not adjusted
  Switched back to using symlinks for all mkspecs on Linux.
  QS60Style: Support for Menu separators
  Native image handle provider support in QGLPixmapData
  Fix an issue with VGImage readback in openvg.
  QSysInfo support for next generation Symbian devices.
  Call FixNativeOrientation on Symbian for certain fullscreen qml views.

3 files changed, 69 insertions, 62 deletions

diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri
index 65de6e0..8ff423e 100644
--- a/src/corelib/global/global.pri
+++ b/src/corelib/global/global.pri
@@ -26,6 +26,9 @@ linux*:!static:!symbian-armcc:!symbian-gcce {
 }
 
 # Compensate for lack of platform defines in Symbian3 and Symbian4
-symbian: DEFINES += SYMBIAN_VERSION_$$upper($$replace(SYMBIAN_VERSION,\\.,_))
+symbian {
+    DEFINES += SYMBIAN_VERSION_$$upper($$replace(SYMBIAN_VERSION,\\.,_)) \
+               S60_VERSION_$$upper($$replace(S60_VERSION,\\.,_))
+}
 
 include(../../../tools/shared/symbian/epocroot.pri)
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 25ddd24..35719b1 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -86,7 +86,6 @@
 # include "private/qcore_symbian_p.h"
 
 _LIT(qt_S60Filter, "Series60v?.*.sis");
-_LIT(qt_symbianFilter, "Symbianv*.sis");
 _LIT(qt_symbianSystemInstallDir, "z:\\system\\install\\");
 #endif
 
@@ -1201,7 +1200,7 @@ bool qSharedBuild()
     \value SV_SF_1 Symbian^1
     \value SV_SF_2 Symbian^2
     \value SV_SF_3 Symbian^3
-    \value SV_SF_4 Symbian^4
+    \value SV_SF_4 \e{This enum value is deprecated.}
     \value SV_Unknown An unknown and currently unsupported platform
 
     \sa S60Version, WinVersion, MacVersion
@@ -1219,7 +1218,8 @@ bool qSharedBuild()
     \value SV_S60_3_2 S60 3rd Edition Feature Pack 2
     \value SV_S60_5_0 S60 5th Edition
     \value SV_S60_5_1 S60 5th Edition Feature Pack 1
-    \value SV_S60_5_2 S60 5th Edition Feature Pack 2
+    \value SV_S60_5_2 Symbian^3
+    \value SV_S60_5_3 To be determined - FIXME
     \value SV_S60_Unknown An unknown and currently unsupported platform
     \omitvalue SV_S60_None
 
@@ -1815,12 +1815,10 @@ const QSysInfo::WinVersion QSysInfo::WindowsVersion = QSysInfo::windowsVersion()
 
 #ifdef Q_OS_SYMBIAN
 static QSysInfo::SymbianVersion cachedSymbianVersion = QSysInfo::SymbianVersion(-1);
+static QSysInfo::S60Version cachedS60Version = QSysInfo::S60Version(-1);
 
-QSysInfo::SymbianVersion QSysInfo::symbianVersion()
+static void symbianInitVersions()
 {
-    if (cachedSymbianVersion != -1)
-        return cachedSymbianVersion;
-
     // Use pure Symbian code, because if done using QDir, there will be a call back
     // to this method, resulting doing this expensive operation twice before the cache kicks in.
     // Pure Symbian code also makes this method ~10x faster, speeding up the application launch.
@@ -1828,21 +1826,8 @@ QSysInfo::SymbianVersion QSysInfo::symbianVersion()
     TFindFile fileFinder(rfs);
     CDir* contents;
 
-    // Check for Symbian4
-    TInt err = fileFinder.FindWildByDir(qt_symbianFilter, qt_symbianSystemInstallDir, contents);
-    if (err == KErrNone) {
-        QScopedPointer<CDir> contentsDeleter(contents);
-        err = contents->Sort(EDescending|ESortByName);
-        if (err == KErrNone && contents->Count() > 0 && (*contents)[0].iName.Length() >= 9) {
-            TInt major = (*contents)[0].iName[8] - '0';
-            if (major == 4) {
-                return cachedSymbianVersion = SV_SF_4;
-            }
-        }
-    }
-
-    // Check for S60 and Symbian3 platforms, which use older .sis naming scheme
-    err = fileFinder.FindWildByDir(qt_S60Filter, qt_symbianSystemInstallDir, contents);
+    // Check for platform version
+    TInt err = fileFinder.FindWildByDir(qt_S60Filter, qt_symbianSystemInstallDir, contents);
     if (err == KErrNone) {
         QScopedPointer<CDir> contentsDeleter(contents);
         err = contents->Sort(EDescending|ESortByName);
@@ -1851,61 +1836,76 @@ QSysInfo::SymbianVersion QSysInfo::symbianVersion()
             TInt minor = (*contents)[0].iName[11] - '0';
             if (major == 3) {
                 if (minor == 1) {
-                    return cachedSymbianVersion = SV_9_2;
+                    cachedS60Version = QSysInfo::SV_S60_3_1;
+                    cachedSymbianVersion = QSysInfo::SV_9_2;
                 } else if (minor == 2) {
-                    return cachedSymbianVersion = SV_9_3;
+                    cachedS60Version = QSysInfo::SV_S60_3_2;
+                    cachedSymbianVersion = QSysInfo::SV_9_3;
                 }
             } else if (major == 5) {
                 if (minor == 0) {
-                    return cachedSymbianVersion = SV_9_4;
-                }
-                else if (minor == 1) {
-                    return cachedSymbianVersion = SV_SF_2;
-                }
-                else if (minor >= 2) {
-                    return cachedSymbianVersion = SV_SF_3;
+                    cachedS60Version = QSysInfo::SV_S60_5_0;
+                    cachedSymbianVersion = QSysInfo::SV_9_4;
+                } else if (minor == 1) {
+                    cachedS60Version = QSysInfo::SV_S60_5_1;
+                    cachedSymbianVersion = QSysInfo::SV_SF_2;
+                } else if (minor == 2) {
+                    cachedS60Version = QSysInfo::SV_S60_5_2;
+                    cachedSymbianVersion = QSysInfo::SV_SF_3;
+                } else if (minor >= 3) {
+                    cachedS60Version = QSysInfo::SV_S60_5_3;
+                    cachedSymbianVersion = QSysInfo::SV_SF_3;
                 }
             }
         }
     }
 
 #  ifdef Q_CC_NOKIAX86
-    // Some emulator environments may not contain the version specific .sis files, so
-    // simply hardcode the version on those environments. Note that can't use
-    // SYMBIAN_VERSION_* defines for S60 3.x/5.0 platforms, as they do not define them
-    // right anyway in case .sis files are not found.
+    if (cachedS60Version == -1) {
+        // Some emulator environments may not contain the version specific .sis files, so
+        // simply hardcode the version on those environments. Note that can't use
+        // S60_VERSION_* defines for S60 3.x/5.0 platforms, as they do not define them
+        // right anyway in case .sis files are not found.
 #   if defined(__SERIES60_31__)
-    return cachedSymbianVersion = SV_9_2;
+        cachedS60Version = QSysInfo::SV_S60_3_1;
+        cachedSymbianVersion = QSysInfo::SV_9_2;
 #   elif defined(__S60_32__)
-    return cachedSymbianVersion = SV_9_3;
+        cachedS60Version = QSysInfo::SV_S60_3_2;
+        cachedSymbianVersion = QSysInfo::SV_9_3;
 #   elif defined(__S60_50__)
-    return cachedSymbianVersion = SV_9_4;
-#   elif defined(SYMBIAN_VERSION_SYMBIAN3)
-    return cachedSymbianVersion = SV_SF_3;
-#   elif defined(SYMBIAN_VERSION_SYMBIAN4)
-    return cachedSymbianVersion = SV_SF_4;
+        cachedS60Version = QSysInfo::SV_S60_5_0;
+        cachedSymbianVersion = QSysInfo::SV_9_4;
+#   elif defined(S60_VERSION_5_2)
+        cachedS60Version = QSysInfo::SV_S60_5_2;
+        cachedSymbianVersion = QSysInfo::SV_SF_3;
+#   elif defined(S60_VERSION_5_3)
+        cachedS60Version = QSysInfo::SV_S60_5_3;
+        cachedSymbianVersion = QSysInfo::SV_SF_3;
 #   endif
+    }
 #  endif
-    //If reaching here, it was not possible to determine the version
-    return cachedSymbianVersion = SV_Unknown;
+
+    if (cachedS60Version == -1) {
+        //If reaching here, it was not possible to determine the version
+        cachedS60Version = QSysInfo::SV_S60_Unknown;
+        cachedSymbianVersion = QSysInfo::SV_Unknown;
+    }
+}
+
+QSysInfo::SymbianVersion QSysInfo::symbianVersion()
+{
+    if (cachedSymbianVersion == -1)
+        symbianInitVersions();
+
+    return cachedSymbianVersion;
 }
 
 QSysInfo::S60Version QSysInfo::s60Version()
 {
-    switch (symbianVersion()) {
-    case SV_9_2:
-        return SV_S60_3_1;
-    case SV_9_3:
-        return SV_S60_3_2;
-    case SV_9_4:
-        return SV_S60_5_0;
-    case SV_SF_2:
-        return SV_S60_5_1;
-    case SV_SF_3:
-        return SV_S60_5_2;
-    default:
-        return SV_S60_Unknown;
-    }
+    if (cachedS60Version == -1)
+        symbianInitVersions();
+
+    return cachedS60Version;
 }
 #endif // ifdef Q_OS_SYMBIAN
 
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 55c96c6..7768b46 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1524,7 +1524,7 @@ public:
         SV_SF_1 = SV_9_4,
         SV_SF_2 = 40,
         SV_SF_3 = 50,
-        SV_SF_4 = 60
+        SV_SF_4 = 60  // Deprecated
     };
     static SymbianVersion symbianVersion();
     enum S60Version {
@@ -1533,9 +1533,9 @@ public:
         SV_S60_3_1 = SV_9_2,
         SV_S60_3_2 = SV_9_3,
         SV_S60_5_0 = SV_9_4,
-        //versions beyond 5.0 are to be confirmed - it is better to use symbian version
         SV_S60_5_1 = SV_SF_2,
-        SV_S60_5_2 = SV_SF_3
+        SV_S60_5_2 = SV_SF_3,
+        SV_S60_5_3 = 70
     };
     static S60Version s60Version();
 #endif
@@ -2459,6 +2459,10 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf();
 #define Q_SYMBIAN_SUPPORTS_MULTIPLE_SCREENS
 #endif
 
+#ifdef SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION
+#define Q_SYMBIAN_SUPPORTS_FIXNATIVEORIENTATION
+#endif
+
 //Symbian does not support data imports from a DLL
 #define Q_NO_DATA_RELOCATION