Modernize the "thread" feature

Add it to configure.json and replace all occurrences of QT_NO_THREAD
with QT_CONFIG(thread). Add conditions for other features that depend
on thread support. Remove conditions where we can use the QMutex and
QThreadStorage stubs.

Change-Id: I284e5d794fda9a4c6f4a1ab29e55aa686272a0eb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

2 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/platforms/windows/qwindowsthreadpoolrunner.h b/src/plugins/platforms/windows/qwindowsthreadpoolrunner.h
index 99705927af..731e4b5432 100644
--- a/src/plugins/platforms/windows/qwindowsthreadpoolrunner.h
+++ b/src/plugins/platforms/windows/qwindowsthreadpoolrunner.h
@@ -61,7 +61,7 @@ class QWindowsThreadPoolRunner
 {
     Q_DISABLE_COPY(QWindowsThreadPoolRunner)
 
-#ifndef QT_NO_THREAD
+#if QT_CONFIG(thread)
     template <class RunnableFunction> // nested class implementing QRunnable to execute a function.
     class Runnable : public QRunnable
     {
@@ -104,7 +104,7 @@ public:
 private:
     QMutex m_mutex;
     QWaitCondition m_condition;
-#else // !QT_NO_THREAD
+#else // QT_CONFIG(thread)
 public:
     QWindowsThreadPoolRunner() {}
 
@@ -114,7 +114,7 @@ public:
         f();
         return true;
     }
-#endif // QT_NO_THREAD
+#endif // QT_CONFIG(thread)
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
index a1636302b7..e2455f87fb 100644
--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
@@ -1454,7 +1454,7 @@ bool QMYSQLDriver::open(const QString& db,
     d->preparedQuerysEnabled = false;
 #endif
 
-#ifndef QT_NO_THREAD
+#if QT_CONFIG(thread)
     mysql_thread_init();
 #endif
 
@@ -1468,7 +1468,7 @@ void QMYSQLDriver::close()
 {
     Q_D(QMYSQLDriver);
     if (isOpen()) {
-#ifndef QT_NO_THREAD
+#if QT_CONFIG(thread)
         mysql_thread_end();
 #endif
         mysql_close(d->mysql);