Clean-up warnings in corelib/thread tests

Fixed the following warnings:

 - empty expression statement has no effect; remove unnecessary ';'
   to silence this warning
 - zero as null pointer constant
 - no previous extern declaration for non-static variable
 - use of old-style cast
 - integer conversion warnings

Change-Id: Ieb31b127ce8e3b543aaf88a8e8fc463dcc8bc4e3
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp b/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp
index e83ea07dd4..e5952e7c8d 100644
--- a/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp
+++ b/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp
@@ -114,9 +114,9 @@ void mapSleeper(int &)
     QTest::qSleep(100);
 }
 
-QSet<int> progressValues;
-QSet<QString> progressTexts;
-QMutex mutex;
+static QSet<int> progressValues;
+static QSet<QString> progressTexts;
+static QMutex mutex;
 class ProgressObject : public QObject
 {
 Q_OBJECT
@@ -191,7 +191,7 @@ class CancelObject : public QObject
 Q_OBJECT
 public:
     bool wasCanceled;
-    CancelObject() : wasCanceled(false) {};
+    CancelObject() : wasCanceled(false) {}
 public slots:
     void cancel();
 };