Merge branch 'warningRemovals'

7 files changed, 9 insertions, 11 deletions

diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 208d4a2..7d35926 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -2470,7 +2470,9 @@ typedef uint SeedStorageType;
 #  endif
 
 typedef QThreadStorage<SeedStorageType *> SeedStorage;
+#if defined(Q_OS_UNIX) && !defined(QT_NO_THREAD) && !defined(Q_OS_SYMBIAN)
 Q_GLOBAL_STATIC(SeedStorage, randTLS)  // Thread Local Storage for seed value
+#endif
 
 #endif
 
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index f021d57..ff6dcb9 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1500,7 +1500,7 @@ inline QT3_SUPPORT int qWinVersion() { return QSysInfo::WindowsVersion; }
    Avoid "unused parameter" warnings
 */
 
-#if defined(Q_CC_INTEL) && !defined(Q_OS_WIN)
+#if defined(Q_CC_INTEL) && !defined(Q_OS_WIN) || defined(Q_CC_RVCT)
 template <typename T>
 inline void qUnused(T &x) { (void)x; }
 #  define Q_UNUSED(x) qUnused(x);
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 158147b..29bbe4c 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -263,9 +263,8 @@ QResourcePrivate::ensureInitialized() const
     if(path.startsWith(QLatin1Char(':')))
         path = path.mid(1);
 
-    bool found = false;
     if(path.startsWith(QLatin1Char('/'))) {
-        found = that->load(path);
+        that->load(path);
     } else {
         QMutexLocker lock(resourceMutex());
         QStringList searchPaths = *resourceSearchPaths();
@@ -273,7 +272,6 @@ QResourcePrivate::ensureInitialized() const
         for(int i = 0; i < searchPaths.size(); ++i) {
             const QString searchPath(searchPaths.at(i) + QLatin1Char('/') + path);
             if(that->load(searchPath)) {
-                found = true;
                 that->absoluteFilePath = QLatin1Char(':') + searchPath;
                 break;
             }
diff --git a/src/corelib/kernel/qsharedmemory_symbian.cpp b/src/corelib/kernel/qsharedmemory_symbian.cpp
index d05f9f3..f564391 100644
--- a/src/corelib/kernel/qsharedmemory_symbian.cpp
+++ b/src/corelib/kernel/qsharedmemory_symbian.cpp
@@ -134,8 +134,6 @@ bool QSharedMemoryPrivate::create(int size)
 bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode)
 {
     // Grab a pointer to the memory block
-    TBool readOnly = (mode == QSharedMemory::ReadOnly ? true : false);
-
     if (!chunk.Handle()) {
         QString function = QLatin1String("QSharedMemory::handle");
         QString safeKey = makePlatformSafeKey(key);
diff --git a/src/corelib/tools/qdumper.cpp b/src/corelib/tools/qdumper.cpp
index b863442..2658cec 100644
--- a/src/corelib/tools/qdumper.cpp
+++ b/src/corelib/tools/qdumper.cpp
@@ -92,7 +92,7 @@ static void qProvokeSegFault()
     qCheckAccess(0);
 }
 
-static char qDumpInBuffer[100];
+//static char qDumpInBuffer[100];
 static char qDumpBuffer[1000];
 #ifdef Q_OS_WIN
 static char qDumpBuffer2[sizeof(qDumpBuffer) + 100];
@@ -162,7 +162,7 @@ QDumper::~QDumper()
 #else
     fprintf(stderr, "%d/done\n", token);
 #endif
-    qDumpInBuffer[0] = 0;
+    //qDumpInBuffer[0] = 0;
 }
 
 void QDumper::flush()
diff --git a/src/corelib/tools/qharfbuzz.cpp b/src/corelib/tools/qharfbuzz.cpp
index 9f90e39..3adc022 100644
--- a/src/corelib/tools/qharfbuzz.cpp
+++ b/src/corelib/tools/qharfbuzz.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qharfbuzz_p.h"
-
 #include "qunicodetables_p.h"
 #include "qlibrary.h"
 #include "qtextcodec.h"
 
+#include "qharfbuzz_p.h"
+
 QT_USE_NAMESPACE
 
 extern "C" {
diff --git a/src/corelib/tools/qharfbuzz_p.h b/src/corelib/tools/qharfbuzz_p.h
index 3492d2e..4d7277a 100644
--- a/src/corelib/tools/qharfbuzz_p.h
+++ b/src/corelib/tools/qharfbuzz_p.h
@@ -53,8 +53,8 @@
 #ifndef QHARFBUZZ_P_H
 #define QHARFBUZZ_P_H
 
-#include <harfbuzz-shaper.h>
 #include <QtCore/qglobal.h>
+#include <harfbuzz-shaper.h>
 
 QT_BEGIN_NAMESPACE