2 files changed, 14 insertions, 10 deletions
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
index 27529f8644..7667aff0b2 100644
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
@@ -58,8 +58,8 @@ QT_BEGIN_NAMESPACE
 */
 
 QThreadData::QThreadData(int initialRefCount)
-    : _ref(initialRefCount), thread(0), threadId(0),
-      quitNow(false), loopLevel(0), eventDispatcher(0), canWait(true), isAdopted(false)
+    : _ref(initialRefCount), loopLevel(0), thread(0), threadId(0),
+      eventDispatcher(0), quitNow(false), canWait(true), isAdopted(false)
 {
     // fprintf(stderr, "QThreadData %p created\n", this);
 }
diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h
index fa1f7414f1..8429e41433 100644
--- a/src/corelib/thread/qthread_p.h
+++ b/src/corelib/thread/qthread_p.h
@@ -219,8 +219,6 @@ public:
 
 class QThreadData
 {
-    QAtomicInt _ref;
-
 public:
     QThreadData(int initialRefCount = 1);
     ~QThreadData();
@@ -262,17 +260,23 @@ public:
         { return std::find(locations, locations + Count, method) != locations + Count; }
     };
 
-    QThread *thread;
-    Qt::HANDLE threadId;
-    bool quitNow;
+private:
+    QAtomicInt _ref;
+
+public:
     int loopLevel;
-    QAtomicPointer<QAbstractEventDispatcher> eventDispatcher;
+
     QStack<QEventLoop *> eventLoops;
     QPostEventList postEventList;
-    bool canWait;
+    QThread *thread;
+    Qt::HANDLE threadId;
+    QAtomicPointer<QAbstractEventDispatcher> eventDispatcher;
     QVector<void *> tls;
-    bool isAdopted;
     FlaggedDebugSignatures flaggedSignatures;
+
+    bool quitNow;
+    bool canWait;
+    bool isAdopted;
 };
 
 class QScopedLoopLevelCounter