Compile fix for MSVC 2015 as it does not work with QAtomicInteger<bool>

This fixes the original commit - 9db37be7210d4071c8b2c7bfa98d1822075ab452

Change-Id: I6679ce07a4890f7d8d332f0400a5bbd2cc6bb577
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

6 files changed, 9 insertions, 9 deletions

diff --git a/src/virtualkeyboard/hunspellworker.cpp b/src/virtualkeyboard/hunspellworker.cpp
index a786a409..9517ca4b 100644
--- a/src/virtualkeyboard/hunspellworker.cpp
+++ b/src/virtualkeyboard/hunspellworker.cpp
@@ -259,9 +259,9 @@ HunspellWorker::HunspellWorker(QObject *parent) :
     QThread(parent),
     taskSema(),
     taskLock(),
-    hunspell(0),
-    abort(false)
+    hunspell(0)
 {
+    abort = false;
 }
 
 HunspellWorker::~HunspellWorker()
diff --git a/src/virtualkeyboard/hunspellworker.h b/src/virtualkeyboard/hunspellworker.h
index 43fb07e4..ff423595 100644
--- a/src/virtualkeyboard/hunspellworker.h
+++ b/src/virtualkeyboard/hunspellworker.h
@@ -147,7 +147,7 @@ private:
     QSemaphore taskSema;
     QMutex taskLock;
     Hunhandle *hunspell;
-    QAtomicInteger<bool> abort;
+    QBasicAtomicInt abort;
 };
 
 } // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/lipiworker.cpp b/src/virtualkeyboard/lipiworker.cpp
index 89a202c0..45983621 100644
--- a/src/virtualkeyboard/lipiworker.cpp
+++ b/src/virtualkeyboard/lipiworker.cpp
@@ -188,9 +188,9 @@ LipiWorker::LipiWorker(LTKShapeRecognizer *shapeRecognizer, QObject *parent) :
     QThread(parent),
     taskSema(),
     taskLock(),
-    shapeRecognizer(shapeRecognizer),
-    abort(false)
+    shapeRecognizer(shapeRecognizer)
 {
+    abort = false;
 }
 
 LipiWorker::~LipiWorker()
diff --git a/src/virtualkeyboard/lipiworker.h b/src/virtualkeyboard/lipiworker.h
index 676a2341..1117c3f4 100644
--- a/src/virtualkeyboard/lipiworker.h
+++ b/src/virtualkeyboard/lipiworker.h
@@ -140,7 +140,7 @@ private:
     QSemaphore taskSema;
     QMutex taskLock;
     LTKShapeRecognizer *shapeRecognizer;
-    QAtomicInteger<bool> abort;
+    QBasicAtomicInt abort;
 };
 
 } // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/t9writeworker.cpp b/src/virtualkeyboard/t9writeworker.cpp
index 733033ce..2de62a0b 100644
--- a/src/virtualkeyboard/t9writeworker.cpp
+++ b/src/virtualkeyboard/t9writeworker.cpp
@@ -310,9 +310,9 @@ T9WriteWorker::T9WriteWorker(DECUMA_SESSION *decumaSession, QObject *parent) :
     QThread(parent),
     taskSema(),
     taskLock(),
-    decumaSession(decumaSession),
-    abort(false)
+    decumaSession(decumaSession)
 {
+    abort = false;
 }
 
 T9WriteWorker::~T9WriteWorker()
diff --git a/src/virtualkeyboard/t9writeworker.h b/src/virtualkeyboard/t9writeworker.h
index 23a4cf02..0f130acb 100644
--- a/src/virtualkeyboard/t9writeworker.h
+++ b/src/virtualkeyboard/t9writeworker.h
@@ -175,7 +175,7 @@ private:
     QSemaphore taskSema;
     QMutex taskLock;
     DECUMA_SESSION *decumaSession;
-    QAtomicInteger<bool> abort;
+    QBasicAtomicInt abort;
 };
 
 } // namespace QtVirtualKeyboard