Merge remote branch 'gerrit/master' into refactor

Change-Id: I4e9fc2e2b8f53a7b20831225093126167030a382

5 files changed, 10 insertions, 22 deletions

diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp
index 672372e..4d9c041 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata.cpp
@@ -42,6 +42,7 @@
 #include "qscriptdebuggerconsolecommandgroupdata_p.h"
 
 #include <QtCore/qstring.h>
+#include <QtCore/qshareddata.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -53,7 +54,7 @@ QT_BEGIN_NAMESPACE
   \brief The QScriptDebuggerConsoleCommandGroupData class holds data associated with a console command group.
 */
 
-class QScriptDebuggerConsoleCommandGroupDataPrivate
+class QScriptDebuggerConsoleCommandGroupDataPrivate : public QSharedData
 {
 public:
     QScriptDebuggerConsoleCommandGroupDataPrivate();
@@ -61,13 +62,10 @@ public:
 
     QString shortDescription;
     QString longDescription;
-
-    QBasicAtomicInt ref;
 };
 
 QScriptDebuggerConsoleCommandGroupDataPrivate::QScriptDebuggerConsoleCommandGroupDataPrivate()
 {
-    ref = 0;
 }
 
 QScriptDebuggerConsoleCommandGroupDataPrivate::~QScriptDebuggerConsoleCommandGroupDataPrivate()
diff --git a/src/scripttools/debugging/qscriptdebuggervalue.cpp b/src/scripttools/debugging/qscriptdebuggervalue.cpp
index 3882070..a19a190 100644
--- a/src/scripttools/debugging/qscriptdebuggervalue.cpp
+++ b/src/scripttools/debugging/qscriptdebuggervalue.cpp
@@ -45,6 +45,7 @@
 #include <QtScript/qscriptengine.h>
 #include <QtCore/qdatastream.h>
 #include <QtCore/qdebug.h>
+#include <QtCore/qshareddata.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -56,7 +57,7 @@ QT_BEGIN_NAMESPACE
   \brief The QScriptDebuggerValue class represents a script value.
 */
 
-class QScriptDebuggerValuePrivate
+class QScriptDebuggerValuePrivate : public QSharedData
 {
 public:
     QScriptDebuggerValuePrivate();
@@ -69,14 +70,11 @@ public:
         double numberValue;
         qint64 objectId;
     };
-
-    QBasicAtomicInt ref;
 };
 
 QScriptDebuggerValuePrivate::QScriptDebuggerValuePrivate()
     : type(QScriptDebuggerValue::NoValue)
 {
-    ref = 0;
 }
 
 QScriptDebuggerValuePrivate::~QScriptDebuggerValuePrivate()
diff --git a/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp b/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp
index ab8f040..d06f34f 100644
--- a/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp
+++ b/src/scripttools/debugging/qscriptdebuggervalueproperty.cpp
@@ -43,7 +43,7 @@
 #include "qscriptdebuggervalue_p.h"
 #include "qscriptdebuggerobjectsnapshotdelta_p.h"
 
-#include <QtCore/qatomic.h>
+#include <QtCore/qshareddata.h>
 #include <QtCore/qdatastream.h>
 #include <QtCore/qstring.h>
 
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
   \class QScriptDebuggerValueProperty
 */
 
-class QScriptDebuggerValuePropertyPrivate
+class QScriptDebuggerValuePropertyPrivate : public QSharedData
 {
 public:
     QScriptDebuggerValuePropertyPrivate();
@@ -64,13 +64,10 @@ public:
     QScriptDebuggerValue value;
     QString valueAsString;
     QScriptValue::PropertyFlags flags;
-
-    QBasicAtomicInt ref;
 };
 
 QScriptDebuggerValuePropertyPrivate::QScriptDebuggerValuePropertyPrivate()
 {
-    ref = 0;
 }
 
 QScriptDebuggerValuePropertyPrivate::~QScriptDebuggerValuePropertyPrivate()
diff --git a/src/scripttools/debugging/qscriptscriptdata.cpp b/src/scripttools/debugging/qscriptscriptdata.cpp
index f58d754..074c1e5 100644
--- a/src/scripttools/debugging/qscriptscriptdata.cpp
+++ b/src/scripttools/debugging/qscriptscriptdata.cpp
@@ -44,6 +44,7 @@
 #include <QtCore/qdatastream.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qstringlist.h>
+#include <QtCore/qshareddata.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -55,7 +56,7 @@ QT_BEGIN_NAMESPACE
   \brief The QScriptScriptData class holds data associated with a script.
 */
 
-class QScriptScriptDataPrivate
+class QScriptScriptDataPrivate : public QSharedData
 {
 public:
     QScriptScriptDataPrivate();
@@ -65,13 +66,10 @@ public:
     QString fileName;
     int baseLineNumber;
     QDateTime timeStamp;
-
-    QBasicAtomicInt ref;
 };
 
 QScriptScriptDataPrivate::QScriptScriptDataPrivate()
 {
-    ref = 0;
 }
 
 QScriptScriptDataPrivate::~QScriptScriptDataPrivate()
diff --git a/src/scripttools/debugging/qscriptvalueproperty.cpp b/src/scripttools/debugging/qscriptvalueproperty.cpp
index 91a59e5..4e16f9c 100644
--- a/src/scripttools/debugging/qscriptvalueproperty.cpp
+++ b/src/scripttools/debugging/qscriptvalueproperty.cpp
@@ -41,12 +41,12 @@
 
 #include "qscriptvalueproperty_p.h"
 
-#include <QtCore/qatomic.h>
+#include <QtCore/qshareddata.h>
 #include <QtCore/qstring.h>
 
 QT_BEGIN_NAMESPACE
 
-class QScriptValuePropertyPrivate
+class QScriptValuePropertyPrivate : public QSharedData
 {
 public:
     QScriptValuePropertyPrivate();
@@ -55,13 +55,10 @@ public:
     QString name;
     QScriptValue value;
     QScriptValue::PropertyFlags flags;
-
-    QBasicAtomicInt ref;
 };
 
 QScriptValuePropertyPrivate::QScriptValuePropertyPrivate()
 {
-    ref = 0;
 }
 
 QScriptValuePropertyPrivate::~QScriptValuePropertyPrivate()