diff --git a/share/qtcreator/gdbmacros/gdbmacros_p.h b/share/qtcreator/gdbmacros/gdbmacros_p.h
index 4f5fd570c2ffc2f4d7c569b858e5c64555a24b63..c1aebd425eaa9e62375b3e5661a3d0b53fdc6cea 100644
--- a/share/qtcreator/gdbmacros/gdbmacros_p.h
+++ b/share/qtcreator/gdbmacros/gdbmacros_p.h
@@ -117,6 +117,7 @@ public:
     void *currentChildBeingDeleted;
     void *declarativeData;
     void *objectGuards;
+    QAtomicPointer<void> sharedRefCount;
     int *deleteWatch;
 #endif
 };
diff --git a/tests/auto/debugger/main.cpp b/tests/auto/debugger/main.cpp
index 25099ee209c1e9e403f2b7c070b7af52f527c043..c7aa75897b340ac9ca9dcd7b5438ac027fd08e1d 100644
--- a/tests/auto/debugger/main.cpp
+++ b/tests/auto/debugger/main.cpp
@@ -1868,13 +1868,13 @@ void tst_Debugger::dumpQSharedPointerHelper(QSharedPointer<T> &ptr)
     QByteArray expected("value='");
     QString val1 = ptr.isNull() ? "<null>" : valToString(*ptr.data());
     QString val2 = isSimpleType(dummy) ? val1 : "";
-    const QAtomicInt *weakAddr;
-    const QAtomicInt *strongAddr;
+    const int *weakAddr;
+    const int *strongAddr;
     int weakValue;
     int strongValue;
     if (!ptr.isNull()) {
-        weakAddr = &Cheater::getData(ptr)->weakref;
-        strongAddr = &Cheater::getData(ptr)->strongref;
+        weakAddr = reinterpret_cast<const int *>(&Cheater::getData(ptr)->weakref);
+        strongAddr = reinterpret_cast<const int *>(&Cheater::getData(ptr)->strongref);
         weakValue = *weakAddr;
         strongValue = *strongAddr;
     } else {