QThread: Reuse isMainThread()

Internally, reuse threadId and theMainThreadId.

Change-Id: Iea6e7d8fcbcaf7e2f4dbf8ab33890d0f7954edc0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
index 0745ea6ceb..8f8ab33e64 100644
--- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
+++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
@@ -1041,7 +1041,7 @@ void tst_QCoreApplication::addRemoveLibPaths()
 static bool theMainThreadIsSet()
 {
     // QCoreApplicationPrivate::mainThread() has a Q_ASSERT we'd trigger
-    return QCoreApplicationPrivate::theMainThread.loadRelaxed() != nullptr;
+    return QCoreApplicationPrivate::theMainThreadId.loadRelaxed() != nullptr;
 }
 
 static bool theMainThreadWasUnset = !theMainThreadIsSet(); // global static
@@ -1053,8 +1053,8 @@ void tst_QCoreApplication::theMainThread()
     int argc = 1;
     char *argv[] = { const_cast<char*>(QTest::currentAppName()) };
     TestApplication app(argc, argv);
-    QVERIFY(QCoreApplicationPrivate::theMainThread.loadRelaxed());
-    QCOMPARE(QCoreApplicationPrivate::theMainThread.loadRelaxed(), thread());
+    QVERIFY(QCoreApplicationPrivate::theMainThreadId.loadRelaxed());
+    QVERIFY(QThread::isMainThread());
     QCOMPARE(app.thread(), thread());
     QCOMPARE(app.thread(), QThread::currentThread());
 }
@@ -1067,7 +1067,7 @@ static void createQObjectOnDestruction()
 
 #if !defined(QT_QGUIAPPLICATIONTEST) && !defined(Q_OS_WIN)
     // QCoreApplicationData's global static destructor has run and cleaned up
-    // the QAdoptedThrad.
+    // the QAdoptedThread.
     if (theMainThreadIsSet())
         qFatal("theMainThreadIsSet() returned true; some QObject must have leaked");
 #endif