Changeset 846 for trunk/src/corelib/global/qglobal.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/global/qglobal.cpp (modified) (14 diffs)

trunk/src/corelib/global/qglobal.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -59 +59 @@
 #include <string.h>
 
+
+
+
+
+
 #if !defined(Q_OS_WINCE)
 #  include <errno.h>
@@ -82 +87 @@
 
 _LIT(qt_S60Filter, "Series60v?.*.sis");
-_LIT(qt_S60SystemInstallDir, "z:\\system\\install\\");
+_LIT(qt_symbianFilter, "Symbianv*.sis");
+_LIT(qt_symbianSystemInstallDir, "z:\\system\\install\\");
 #endif
 
@@ -1675 +1681 @@
   \relates <QtGlobal>
 
-  Defined on S60.
+  Defined on S60.
 
   \sa Q_WS_MAC, Q_WS_WIN, Q_WS_X11, Q_WS_QWS
@@ -1866 +1872 @@
 
 #ifdef Q_OS_SYMBIAN
-# ifdef Q_WS_S60
-static QSysInfo::S60Version cachedS60Version = QSysInfo::S60Version(-1);
-
-QSysInfo::S60Version QSysInfo::s60Version()
-{
-    if (cachedS60Version != -1)
-        return cachedS60Version;
+static QSysInfo::SymbianVersion cachedSymbianVersion = QSysInfo::SymbianVersion(-1);
+
+QSysInfo::SymbianVersion QSysInfo::symbianVersion()
+{
+    if (cachedSymbianVersion != -1)
+        return cachedSymbianVersion;
 
     // Use pure Symbian code, because if done using QDir, there will be a call back
@@ -1880 +1885 @@
     TFindFile fileFinder(rfs);
     CDir* contents;
-    TInt err = fileFinder.FindWildByDir(qt_S60Filter, qt_S60SystemInstallDir, contents);
+
+    // Check for Symbian4
+    TInt err = fileFinder.FindWildByDir(qt_symbianFilter, qt_symbianSystemInstallDir, contents);
     if (err == KErrNone) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         err = contents->Sort(EDescending|ESortByName);
         if (err == KErrNone && contents->Count() > 0 && (*contents)[0].iName.Length() >= 12) {
@@ -1888 +1909 @@
             if (major == 3) {
                 if (minor == 1) {
-                    return cachedS60Version = SV_S60_3_1;
+                    return cachedS;
                 } else if (minor == 2) {
-                    return cachedS60Version = SV_S60_3_2;
+                    return cachedS;
                 }
             } else if (major == 5) {
                 if (minor == 0) {
-                    return cachedS60Version = SV_S60_5_0;
+                    return cachedS;
                 }
                 else if (minor == 1) {
-                    return cachedS60Version = SV_S60_5_1;
+                    return cachedS;
                 }
                 else if (minor == 2) {
-                    return cachedS60Version = SV_S60_5_2;
+                    return cachedS;
                 }
             }
         }
-        delete contents;
     }
 
 #  ifdef Q_CC_NOKIAX86
     // Some emulator environments may not contain the version specific .sis files, so
-    // simply hardcode the version on those environments.
+    // 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 defined(__SERIES60_31__)
-    return cachedS60Version = SV_S60_3_1;
+    return cachedS;
 #   elif defined(__S60_32__)
-    return cachedS60Version = SV_S60_3_2;
+    return cachedS;
 #   elif defined(__S60_50__)
-    return cachedS60Version = SV_S60_5_0;
+    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;
 #   endif
 #  endif
     //If reaching here, it was not possible to determine the version
-    return cachedS60Version = SV_S60_Unknown;
-}
-QSysInfo::SymbianVersion QSysInfo::symbianVersion()
-{
-    switch (s60Version()) {
-    case SV_S60_3_1:
-        return SV_9_2;
-    case SV_S60_3_2:
-        return SV_9_3;
-    case SV_S60_5_0:
-        return SV_9_4;
-    case SV_S60_5_1:
-        return SV_9_4;
-    case SV_S60_5_2:
-        return SV_9_4;
+    return cachedSymbianVersion = SV_Unknown;
+}
+
+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_Unknown;
+        return SV_Unknown;
     }
 }
-#else
-QSysInfo::S60Version QSysInfo::s60Version()
-{
-    return SV_S60_None;
-}
-
-QSysInfo::SymbianVersion QSysInfo::symbianVersion()
-{
-    return SV_Unknown;
-}
-# endif // ifdef Q_WS_S60
 #endif // ifdef Q_OS_SYMBIAN
 
@@ -2541 +2557 @@
     appends a newline at the end.
 
-    To supress the output at runtime, install your own message handler
+    To supress the output at runtime, install your own message handler
     with qInstallMsgHandler().
 
@@ -2577 +2593 @@
     appended at the end.
 
-    To supress the output at runtime, install your own message handler
+    To supress the output at runtime, install your own message handler
     with qInstallMsgHandler().
 
@@ -2642 +2658 @@
     \snippet doc/src/snippets/code/src_corelib_global_qglobal.cpp 30
 
-    To supress the output at runtime, install your own message handler
+    To supress the output at runtime, install your own message handler
     with qInstallMsgHandler().
 
@@ -2658 +2674 @@
 // getenv is declared as deprecated in VS2005. This function
 // makes use of the new secure getenv function.
+
+
+
+
+
+
+
+
+
+
+
+
+
 QByteArray qgetenv(const char *varName)
 {
@@ -2677 +2706 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 bool qputenv(const char *varName, const QByteArray& value)
 {
@@ -2744 +2787 @@
     srand(seed);
 #endif
-}
-
-/*! \internal
-    \relates <QtGlobal>
-    \since 4.6
-
-    Seed the PRNG, but only if it has not already been seeded.
-
-    The default seed is a combination of current time, a stack address and a
-    serial counter (since thread stack addresses are re-used).
-*/
-void qsrand()
-{
-#if (defined(Q_OS_UNIX) || defined(Q_OS_WIN)) && !defined(QT_NO_THREAD)
-    SeedStorage *seedStorage = randTLS();
-    if (seedStorage) {
-        SeedStorageType *pseed = seedStorage->localData();
-        if (pseed) {
-            // already seeded
-            return;
-        }
-        seedStorage->setLocalData(pseed = new SeedStorageType);
-        // start beyond 1 to avoid the sequence reset
-        static QBasicAtomicInt serial = Q_BASIC_ATOMIC_INITIALIZER(2);
-        *pseed = QDateTime::currentDateTime().toTime_t()
-                 + quintptr(&pseed)
-                 + serial.fetchAndAddRelaxed(1);
-#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
-        // for Windows and Symbian the srand function must still be called.
-        srand(*pseed);
-#endif
-    }
-
-//QT_NO_THREAD implementations
-#else
-    static unsigned int seed = 0;
-
-    if (seed)
-        return;
-
-#if defined(Q_OS_SYMBIAN)
-    seed = Math::Random();
-#elif defined(Q_OS_WIN)
-    seed = GetTickCount();
-#else
-    seed = quintptr(&seed) + QDateTime::currentDateTime().toTime_t();
-#endif
-    srand(seed);
-#endif // defined(Q_OS_UNIX) || defined(Q_OS_WIN)) && !defined(QT_NO_THREAD)
 }
 
@@ -3103 +3097 @@
 
     You can use this macro to specify information about a custom type
-    \a Type. With accurate type information, Qt's \l{generic
-    containers} can choose appropriate storage methods and algorithms.
+    \a Type. With accurate type information, Qt's \l{Container Classes}
+    {generic containers} can choose appropriate storage methods and
+    algorithms.
 
     \a Flags can be one of the following: