Merge remote-tracking branch 'origin/dev' into new-backend

Change-Id: I1a49b4a242ed0764101521d06ec612e96bff0e4c

39 files changed, 47 insertions, 355 deletions

diff --git a/src/plugins/qmltooling/packetprotocol/packetprotocol.pro b/src/plugins/qmltooling/packetprotocol/packetprotocol.pro
index 383e32b54e..990d3169ad 100644
--- a/src/plugins/qmltooling/packetprotocol/packetprotocol.pro
+++ b/src/plugins/qmltooling/packetprotocol/packetprotocol.pro
@@ -4,7 +4,8 @@ CONFIG += static internal_module
 
 HEADERS = \
     qpacketprotocol_p.h \
-    qpacket_p.h
+    qpacket_p.h \
+    qqmldebugpacket_p.h
 
 SOURCES = \
     qpacketprotocol.cpp \
diff --git a/src/plugins/qmltooling/shared/qqmldebugpacket.h b/src/plugins/qmltooling/packetprotocol/qqmldebugpacket_p.h
index f1c21e0a2b..9a0f8cd82d 100644
--- a/src/plugins/qmltooling/shared/qqmldebugpacket.h
+++ b/src/plugins/qmltooling/packetprotocol/qqmldebugpacket_p.h
@@ -40,9 +40,10 @@
 #ifndef QQMLDEBUGPACKET_P_H
 #define QQMLDEBUGPACKET_P_H
 
+#include "qpacket_p.h"
+
 #include <QtCore/qbuffer.h>
 #include <QtQml/private/qqmldebugconnector_p.h>
-#include <QtPacketProtocol/private/qpacket_p.h>
 
 //
 //  W A R N I N G
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro b/src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro
index f3f8a21ff8..2d8f0ceda2 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro
+++ b/src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro
@@ -12,8 +12,6 @@ SOURCES += \
     $$PWD/qv4debugjob.cpp
 
 HEADERS += \
-    $$PWD/../shared/qqmlconfigurabledebugservice.h \
-    $$PWD/../shared/qqmldebugpacket.h \
     $$PWD/qqmldebuggerservicefactory.h \
     $$PWD/qqmlenginedebugservice.h \
     $$PWD/qqmlwatcher.h \
@@ -23,9 +21,6 @@ HEADERS += \
     $$PWD/qv4datacollector.h \
     $$PWD/qv4debugjob.h
 
-INCLUDEPATH += $$PWD \
-    $$PWD/../shared
-
 OTHER_FILES += \
     $$PWD/qqmldebuggerservice.json
 
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
index 3d08c4c809..182e4257f8 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
@@ -39,7 +39,6 @@
 
 #include "qqmlenginedebugservice.h"
 #include "qqmlwatcher.h"
-#include "qqmldebugpacket.h"
 
 #include <private/qqmldebugstatesdelegate_p.h>
 #include <private/qqmlboundsignal_p.h>
@@ -57,6 +56,7 @@
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qfileinfo.h>
 #include <private/qmetaobject_p.h>
+#include <private/qqmldebugpacket_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
index cb40c9e36a..6f254c9e28 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
@@ -271,7 +271,7 @@ GatherSourcesJob::GatherSourcesJob(QV4::ExecutionEngine *engine)
 
 void GatherSourcesJob::run()
 {
-    for (QV4::CompiledData::CompilationUnit *unit : qAsConst(engine->compilationUnits)) {
+    for (QV4::CompiledData::CompilationUnit *unit : engine->compilationUnits) {
         QString fileName = unit->fileName();
         if (!fileName.isEmpty())
             sources.append(fileName);
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
index f3617ed6ff..fca811cb28 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
@@ -40,12 +40,12 @@
 #include "qv4debugservice.h"
 #include "qv4debugjob.h"
 #include "qqmlengine.h"
-#include "qqmldebugpacket.h"
 
 #include <private/qv4engine_p.h>
 #include <private/qv4function_p.h>
 #include <private/qqmldebugconnector_p.h>
 #include <private/qv8engine_p.h>
+#include <private/qqmldebugpacket_p.h>
 
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h
index 8a01061ec2..5401956994 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h
@@ -51,9 +51,9 @@
 // We mean it.
 //
 
-#include "qqmlconfigurabledebugservice.h"
 #include "qv4debuggeragent.h"
 #include "qv4datacollector.h"
+#include <private/qqmlconfigurabledebugservice_p.h>
 #include <private/qqmldebugserviceinterfaces_p.h>
 #include <private/qv4debugging_p.h>
 
diff --git a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp
index 7145645609..7ce83daed6 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp
@@ -40,11 +40,11 @@
 #include "globalinspector.h"
 #include "highlight.h"
 #include "inspecttool.h"
-#include "qqmldebugpacket.h"
 
 #include <private/qqmldebugserviceinterfaces_p.h>
 #include <private/qabstractanimation_p.h>
 #include <private/qqmlcomponent_p.h>
+#include <private/qqmldebugpacket_p.h>
 
 #include <QtGui/qwindow.h>
 
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
index a8844944e0..18a61f15b7 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
+++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
@@ -1,8 +1,6 @@
 TARGET = qmldbg_inspector
 QT    += qml-private quick-private core-private gui-private packetprotocol-private
 
-INCLUDEPATH *= $$PWD $$PWD/../shared
-
 SOURCES += \
     $$PWD/globalinspector.cpp \
     $$PWD/highlight.cpp \
@@ -11,7 +9,6 @@ SOURCES += \
     $$PWD/qquickwindowinspector.cpp
 
 HEADERS += \
-    $$PWD/../shared/qqmldebugpacket.h \
     $$PWD/globalinspector.h \
     $$PWD/highlight.h \
     $$PWD/inspecttool.h\
diff --git a/src/plugins/qmltooling/qmldbg_local/qlocalclientconnection.cpp b/src/plugins/qmltooling/qmldbg_local/qlocalclientconnection.cpp
index 97e4b4e3e4..e60644518f 100644
--- a/src/plugins/qmltooling/qmldbg_local/qlocalclientconnection.cpp
+++ b/src/plugins/qmltooling/qmldbg_local/qlocalclientconnection.cpp
@@ -38,10 +38,10 @@
 ****************************************************************************/
 
 #include "qlocalclientconnectionfactory.h"
-#include "qqmldebugserver.h"
 
 #include <QtCore/qplugin.h>
 #include <QtNetwork/qlocalsocket.h>
+#include <private/qqmldebugserver_p.h>
 
 Q_DECLARE_METATYPE(QLocalSocket::LocalSocketError)
 
diff --git a/src/plugins/qmltooling/qmldbg_local/qlocalclientconnectionfactory.h b/src/plugins/qmltooling/qmldbg_local/qlocalclientconnectionfactory.h
index b64a1fff95..95bbd8956a 100644
--- a/src/plugins/qmltooling/qmldbg_local/qlocalclientconnectionfactory.h
+++ b/src/plugins/qmltooling/qmldbg_local/qlocalclientconnectionfactory.h
@@ -40,7 +40,7 @@
 #ifndef QLOCALCLIENTCONNECTIONFACTORY_H
 #define QLOCALCLIENTCONNECTIONFACTORY_H
 
-#include "qqmldebugserverconnection.h"
+#include <private/qqmldebugserverconnection_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/qmltooling/qmldbg_local/qmldbg_local.pro b/src/plugins/qmltooling/qmldbg_local/qmldbg_local.pro
index d731e47b7e..71dba262da 100644
--- a/src/plugins/qmltooling/qmldbg_local/qmldbg_local.pro
+++ b/src/plugins/qmltooling/qmldbg_local/qmldbg_local.pro
@@ -5,12 +5,7 @@ SOURCES += \
     $$PWD/qlocalclientconnection.cpp
 
 HEADERS += \
-    $$PWD/qlocalclientconnectionfactory.h \
-    $$PWD/../shared/qqmldebugserver.h \
-    $$PWD/../shared/qqmldebugserverconnection.h
-
-INCLUDEPATH += $$PWD \
-    $$PWD/../shared
+    $$PWD/qlocalclientconnectionfactory.h
 
 OTHER_FILES += \
     $$PWD/qlocalclientconnection.json
diff --git a/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.cpp b/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.cpp
index b0f59717ac..bdfed03a40 100644
--- a/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.cpp
@@ -38,8 +38,9 @@
 ****************************************************************************/
 
 #include "qdebugmessageservice.h"
-#include "qqmldebugpacket.h"
+
 #include <private/qqmldebugconnector_p.h>
+#include <private/qqmldebugpacket_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/qmltooling/qmldbg_messages/qmldbg_messages.pro b/src/plugins/qmltooling/qmldbg_messages/qmldbg_messages.pro
index 5ddf7c615d..eda6df1a16 100644
--- a/src/plugins/qmltooling/qmldbg_messages/qmldbg_messages.pro
+++ b/src/plugins/qmltooling/qmldbg_messages/qmldbg_messages.pro
@@ -6,13 +6,9 @@ SOURCES += \
     $$PWD/qdebugmessageservicefactory.cpp
 
 HEADERS += \
-    $$PWD/../shared/qqmldebugpacket.h \
     $$PWD/qdebugmessageservice.h \
     $$PWD/qdebugmessageservicefactory.h
 
-INCLUDEPATH += $$PWD \
-    $$PWD/../shared
-
 OTHER_FILES += \
     $$PWD/qdebugmessageservice.json
 
diff --git a/src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro b/src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro
index e5489574be..6630a394a0 100644
--- a/src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro
+++ b/src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro
@@ -2,15 +2,11 @@ TARGET = qmldbg_native
 QT = qml-private core-private packetprotocol-private
 
 HEADERS += \
-    $$PWD/../shared/qqmldebugpacket.h \
     $$PWD/qqmlnativedebugconnector.h
 
 SOURCES += \
     $$PWD/qqmlnativedebugconnector.cpp
 
-INCLUDEPATH += $$PWD \
-    $$PWD/../shared
-
 OTHER_FILES += \
     $$PWD/qqmlnativedebugconnector.json
 
diff --git a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp
index 388d2e3b22..a4b3455eff 100644
--- a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp
+++ b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp
@@ -38,9 +38,9 @@
 ****************************************************************************/
 
 #include "qqmlnativedebugconnector.h"
-#include "qqmldebugpacket.h"
 
 #include <private/qhooks_p.h>
+#include <private/qqmldebugpacket_p.h>
 
 #include <QtQml/qjsengine.h>
 #include <QtCore/qdebug.h>
diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/qmldbg_nativedebugger.pro b/src/plugins/qmltooling/qmldbg_nativedebugger/qmldbg_nativedebugger.pro
index 1873a6a77c..1cb5525622 100644
--- a/src/plugins/qmltooling/qmldbg_nativedebugger/qmldbg_nativedebugger.pro
+++ b/src/plugins/qmltooling/qmldbg_nativedebugger/qmldbg_nativedebugger.pro
@@ -6,13 +6,9 @@ SOURCES += \
     $$PWD/qqmlnativedebugservice.cpp
 
 HEADERS += \
-    $$PWD/../shared/qqmldebugpacket.h \
     $$PWD/qqmlnativedebugservicefactory.h \
     $$PWD/qqmlnativedebugservice.h \
 
-INCLUDEPATH += $$PWD \
-    $$PWD/../shared
-
 OTHER_FILES += \
     $$PWD/qqmlnativedebugservice.json
 
diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
index 917d40fd6a..b6ae20a02e 100644
--- a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include "qqmlnativedebugservice.h"
-#include "qqmldebugpacket.h"
 
 #include <private/qqmldebugconnector_p.h>
 #include <private/qv4debugging_p.h>
@@ -50,6 +49,7 @@
 #include <private/qv4objectiterator_p.h>
 #include <private/qv4identifier_p.h>
 #include <private/qv4runtime_p.h>
+#include <private/qqmldebugpacket_p.h>
 #include <private/qqmldebugserviceinterfaces_p.h>
 
 #include <QtQml/qjsengine.h>
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qmldbg_profiler.pro b/src/plugins/qmltooling/qmldbg_profiler/qmldbg_profiler.pro
index 4629a7b81e..ac874b079e 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qmldbg_profiler.pro
+++ b/src/plugins/qmltooling/qmldbg_profiler/qmldbg_profiler.pro
@@ -9,17 +9,12 @@ SOURCES += \
     $$PWD/qv4profileradapter.cpp
 
 HEADERS += \
-    $$PWD/../shared/qqmlconfigurabledebugservice.h \
-    $$PWD/../shared/qqmldebugpacket.h \
     $$PWD/qqmlenginecontrolservice.h \
     $$PWD/qqmlprofileradapter.h \
     $$PWD/qqmlprofilerservice.h \
     $$PWD/qqmlprofilerservicefactory.h \
     $$PWD/qv4profileradapter.h
 
-INCLUDEPATH += $$PWD \
-    $$PWD/../shared
-
 OTHER_FILES += \
     $$PWD/qqmlprofilerservice.json
 
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.cpp
index 9918a95116..4eedb4bd51 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "qqmlenginecontrolservice.h"
-#include "qqmldebugpacket.h"
+#include <private/qqmldebugpacket_p.h>
 #include <QJSEngine>
 
 QT_BEGIN_NAMESPACE
@@ -53,8 +53,8 @@ void QQmlEngineControlServiceImpl::messageReceived(const QByteArray &message)
 {
     QMutexLocker lock(&dataMutex);
     QQmlDebugPacket d(message);
-    int command;
-    int engineId;
+    qint32 command;
+    qint32 engineId;
     d >> command >> engineId;
     QJSEngine *engine = qobject_cast<QJSEngine *>(objectForId(engineId));
     if (command == StartWaitingEngine && startingEngines.contains(engine)) {
@@ -112,10 +112,11 @@ void QQmlEngineControlServiceImpl::engineRemoved(QJSEngine *engine)
     }
 }
 
-void QQmlEngineControlServiceImpl::sendMessage(QQmlEngineControlServiceImpl::MessageType type, QJSEngine *engine)
+void QQmlEngineControlServiceImpl::sendMessage(QQmlEngineControlServiceImpl::MessageType type,
+                                               QJSEngine *engine)
 {
     QQmlDebugPacket d;
-    d << int(type) << idForObject(engine);
+    d << static_cast<qint32>(type) << idForObject(engine);
     emit messageToClient(name(), d.data());
 }
 
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
index d676731ba7..5ff1b1f97e 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
@@ -38,8 +38,8 @@
 ****************************************************************************/
 
 #include "qqmlprofileradapter.h"
-#include "qqmldebugpacket.h"
 
+#include <private/qqmldebugpacket_p.h>
 #include <private/qqmldebugserviceinterfaces_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
index 4176ede40e..c388c6e74a 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
@@ -41,9 +41,9 @@
 #include "qv4profileradapter.h"
 #include "qqmlprofileradapter.h"
 #include "qqmlprofilerservicefactory.h"
-#include "qqmldebugpacket.h"
 
 #include <private/qjsengine_p.h>
+#include <private/qqmldebugpacket_p.h>
 #include <private/qqmldebugpluginmanager_p.h>
 
 #include <QtCore/qurl.h>
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h
index e6f89e850a..a5e060a1ab 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include "qqmlconfigurabledebugservice.h"
+#include <private/qqmlconfigurabledebugservice_p.h>
 #include <private/qqmldebugserviceinterfaces_p.h>
 #include <private/qqmlprofilerdefinitions_p.h>
 #include <private/qqmlabstractprofileradapter_p.h>
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.h b/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.h
index 5d5b83f7ca..7ac378acd9 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.h
+++ b/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.h
@@ -53,7 +53,7 @@
 
 #include <private/qv4profiling_p.h>
 #include <private/qqmlabstractprofileradapter_p.h>
-#include "qqmldebugpacket.h"
+#include <private/qqmldebugpacket_p.h>
 
 #include <QStack>
 #include <QList>
diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/qmldbg_quickprofiler.pro b/src/plugins/qmltooling/qmldbg_quickprofiler/qmldbg_quickprofiler.pro
index 6ca0a184ca..f165917041 100644
--- a/src/plugins/qmltooling/qmldbg_quickprofiler/qmldbg_quickprofiler.pro
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/qmldbg_quickprofiler.pro
@@ -5,8 +5,6 @@ PLUGIN_TYPE = qmltooling
 PLUGIN_CLASS_NAME = QQuickProfilerAdapterFactory
 load(qt_plugin)
 
-INCLUDEPATH += $$PWD/../shared
-
 SOURCES += \
     $$PWD/qquickprofileradapter.cpp \
     $$PWD/qquickprofileradapterfactory.cpp
@@ -14,7 +12,6 @@ SOURCES += \
 HEADERS += \
     $$PWD/qquickprofileradapter.h \
     $$PWD/qquickprofileradapterfactory.h \
-    $$PWD/../shared/qqmldebugpacket.h
 
 OTHER_FILES += \
     qquickprofileradapter.json
diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp
index 35beb0ee0d..a05d11664d 100644
--- a/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp
@@ -38,8 +38,9 @@
 ****************************************************************************/
 
 #include "qquickprofileradapter.h"
-#include "qqmldebugpacket.h"
+
 #include <QCoreApplication>
+#include <private/qqmldebugpacket_p.h>
 #include <private/qqmldebugserviceinterfaces_p.h>
 #include <private/qquickprofiler_p.h>
 
diff --git a/src/plugins/qmltooling/qmldbg_server/qmldbg_server.pro b/src/plugins/qmltooling/qmldbg_server/qmldbg_server.pro
index fffdb4c888..d7d24a4d39 100644
--- a/src/plugins/qmltooling/qmldbg_server/qmldbg_server.pro
+++ b/src/plugins/qmltooling/qmldbg_server/qmldbg_server.pro
@@ -5,13 +5,7 @@ SOURCES += \
     $$PWD/qqmldebugserver.cpp
 
 HEADERS += \
-    $$PWD/qqmldebugserverfactory.h \
-    $$PWD/../shared/qqmldebugserver.h \
-    $$PWD/../shared/qqmldebugserverconnection.h \
-    $$PWD/../shared/qqmldebugpacket.h
-
-INCLUDEPATH += $$PWD \
-    $$PWD/../shared
+    $$PWD/qqmldebugserverfactory.h
 
 OTHER_FILES += \
     qqmldebugserver.json
diff --git a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
index 59848ceb82..f87ade568b 100644
--- a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
+++ b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
@@ -37,17 +37,17 @@
 **
 ****************************************************************************/
 
-#include "qqmldebugserver.h"
 #include "qqmldebugserverfactory.h"
-#include "qqmldebugserverconnection.h"
-#include "qqmldebugpacket.h"
 
+#include <private/qqmldebugserver_p.h>
+#include <private/qqmldebugserverconnection_p.h>
 #include <private/qqmldebugservice_p.h>
 #include <private/qjsengine_p.h>
 #include <private/qqmlglobal_p.h>
 #include <private/qqmldebugpluginmanager_p.h>
 #include <private/qqmldebugserviceinterfaces_p.h>
 #include <private/qpacketprotocol_p.h>
+#include <private/qqmldebugpacket_p.h>
 
 #include <QtCore/QAtomicInt>
 #include <QtCore/QDir>
@@ -767,4 +767,3 @@ QQmlDebugConnector *QQmlDebugServerFactory::create(const QString &key)
 QT_END_NAMESPACE
 
 #include "qqmldebugserver.moc"
-#include "moc_qqmldebugserver.cpp"
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
index 1face1813e..a0e9d06fd5 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
+++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
@@ -5,12 +5,7 @@ SOURCES += \
     $$PWD/qtcpserverconnection.cpp
 
 HEADERS += \
-    $$PWD/qtcpserverconnectionfactory.h \
-    $$PWD/../shared/qqmldebugserver.h \
-    $$PWD/../shared/qqmldebugserverconnection.h
-
-INCLUDEPATH += $$PWD \
-    $$PWD/../shared
+    $$PWD/qtcpserverconnectionfactory.h
 
 OTHER_FILES += \
     $$PWD/qtcpserverconnection.json
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
index af4f5292ba..c2aafda863 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
+++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
@@ -38,7 +38,8 @@
 ****************************************************************************/
 
 #include "qtcpserverconnectionfactory.h"
-#include "qqmldebugserver.h"
+
+#include <private/qqmldebugserver_p.h>
 
 #include <QtCore/qplugin.h>
 #include <QtNetwork/qtcpserver.h>
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnectionfactory.h b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnectionfactory.h
index d3b0e00584..d1282c9d47 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnectionfactory.h
+++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnectionfactory.h
@@ -40,7 +40,7 @@
 #ifndef QTCPSERVERCONNECTIONFACTORY_H
 #define QTCPSERVERCONNECTIONFACTORY_H
 
-#include "qqmldebugserverconnection.h"
+#include <private/qqmldebugserverconnection_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/qmltooling/shared/qqmlconfigurabledebugservice.h b/src/plugins/qmltooling/shared/qqmlconfigurabledebugservice.h
deleted file mode 100644
index 89ac734e05..0000000000
--- a/src/plugins/qmltooling/shared/qqmlconfigurabledebugservice.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#ifndef QQMLCONFIGURABLEDEBUGSEVICE_H
-#define QQMLCONFIGURABLEDEBUGSEVICE_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <private/qqmldebugservice_p.h>
-#include <private/qqmldebugconnector_p.h>
-#include <QtCore/qmutex.h>
-
-QT_BEGIN_NAMESPACE
-
-template <class Base>
-class QQmlConfigurableDebugService : public Base
-{
-protected:
-    QQmlConfigurableDebugService(float version, QObject *parent = 0) :
-        Base(version, parent), m_configMutex(QMutex::Recursive)
-    {
-        init();
-    }
-
-    void stopWaiting()
-    {
-        QMutexLocker lock(&m_configMutex);
-        m_waitingForConfiguration = false;
-        for (QJSEngine *engine : qAsConst(m_waitingEngines))
-            emit Base::attachedToEngine(engine);
-        m_waitingEngines.clear();
-    }
-
-    void init()
-    {
-        QMutexLocker lock(&m_configMutex);
-        // If we're not enabled or not blocking, don't wait for configuration
-        m_waitingForConfiguration = (Base::state() == QQmlDebugService::Enabled &&
-                                     QQmlDebugConnector::instance()->blockingMode());
-    }
-
-    void stateChanged(QQmlDebugService::State newState) override
-    {
-        if (newState != QQmlDebugService::Enabled)
-            stopWaiting();
-        else
-            init();
-    }
-
-    void engineAboutToBeAdded(QJSEngine *engine) override
-    {
-        QMutexLocker lock(&m_configMutex);
-        if (m_waitingForConfiguration)
-            m_waitingEngines.append(engine);
-        else
-            emit Base::attachedToEngine(engine);
-    }
-
-    QMutex m_configMutex;
-    QList<QJSEngine *> m_waitingEngines;
-    bool m_waitingForConfiguration;
-};
-
-QT_END_NAMESPACE
-
-#endif // QQMLCONFIGURABLEDEBUGSEVICE_H
diff --git a/src/plugins/qmltooling/shared/qqmldebugserver.h b/src/plugins/qmltooling/shared/qqmldebugserver.h
deleted file mode 100644
index 109f1e246c..0000000000
--- a/src/plugins/qmltooling/shared/qqmldebugserver.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQMLDEBUGSERVER_H
-#define QQMLDEBUGSERVER_H
-
-#include <private/qqmldebugconnector_p.h>
-#include <private/qtqmlglobal_p.h>
-
-#include <QtCore/QIODevice>
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-QT_BEGIN_NAMESPACE
-
-class QQmlDebugServer : public QQmlDebugConnector
-{
-    Q_OBJECT
-public:
-    virtual void setDevice(QIODevice *socket) = 0;
-};
-
-QT_END_NAMESPACE
-
-#endif // QQMLDEBUGSERVER_H
diff --git a/src/plugins/qmltooling/shared/qqmldebugserverconnection.h b/src/plugins/qmltooling/shared/qqmldebugserverconnection.h
deleted file mode 100644
index 3fac15acb2..0000000000
--- a/src/plugins/qmltooling/shared/qqmldebugserverconnection.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQMLDEBUGSERVERCONNECTION_H
-#define QQMLDEBUGSERVERCONNECTION_H
-
-#include <private/qtqmlglobal_p.h>
-#include <QtCore/qobject.h>
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-QT_BEGIN_NAMESPACE
-
-
-class QQmlDebugServer;
-class QQmlDebugServerConnection : public QObject
-{
-    Q_OBJECT
-public:
-    QQmlDebugServerConnection(QObject *parent = 0) : QObject(parent) {}
-
-    virtual void setServer(QQmlDebugServer *server) = 0;
-    virtual bool setPortRange(int portFrom, int portTo, bool block, const QString &hostaddress) = 0;
-    virtual bool setFileName(const QString &fileName, bool block) = 0;
-    virtual bool isConnected() const = 0;
-    virtual void disconnect() = 0;
-    virtual void waitForConnection() = 0;
-    virtual void flush() = 0;
-};
-
-class QQmlDebugServerConnectionFactory : public QObject
-{
-    Q_OBJECT
-public:
-    virtual QQmlDebugServerConnection *create(const QString &key) = 0;
-};
-
-#define QQmlDebugServerConnectionFactory_iid "org.qt-project.Qt.QQmlDebugServerConnectionFactory"
-Q_DECLARE_INTERFACE(QQmlDebugServerConnectionFactory, QQmlDebugServerConnectionFactory_iid)
-
-QT_END_NAMESPACE
-
-#endif // QQMLDEBUGSERVERCONNECTION_H
diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12builtinmaterials.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12builtinmaterials.cpp
index 3351486bc6..312e8c19cd 100644
--- a/src/plugins/scenegraph/d3d12/qsgd3d12builtinmaterials.cpp
+++ b/src/plugins/scenegraph/d3d12/qsgd3d12builtinmaterials.cpp
@@ -460,8 +460,8 @@ QSGD3D12Material::UpdateResults QSGD3D12SmoothTextureMaterial::updatePipeline(co
 QSGD3D12TextMaterial::QSGD3D12TextMaterial(StyleType styleType, QSGD3D12RenderContext *rc,
                                            const QRawFont &font, QFontEngine::GlyphFormat glyphFormat)
     : m_styleType(styleType),
-      m_font(font),
-      m_rc(rc)
+      m_rc(rc),
+      m_font(font)
 {
     setFlag(Blending, true);
 
diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp
index 908f1221ab..82bf9b0433 100644
--- a/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp
+++ b/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp
@@ -2077,7 +2077,7 @@ void QSGD3D12EnginePrivate::queueDraw(const QSGD3D12Engine::DrawParams &params)
             ? buffers[indexBufIdx].d[currentPFrameIndex].buffer.Get() : nullptr;
 
     if (!skip && params.mode != tframeData.drawingMode) {
-        D3D_PRIMITIVE_TOPOLOGY topology;
+        D3D_PRIMITIVE_TOPOLOGY topology = D3D_PRIMITIVE_TOPOLOGY_UNDEFINED;
         switch (params.mode) {
         case QSGGeometry::DrawPoints:
             topology = D3D_PRIMITIVE_TOPOLOGY_POINTLIST;
diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12engine_p_p.h b/src/plugins/scenegraph/d3d12/qsgd3d12engine_p_p.h
index 1048ed63e7..a95cbb1cbb 100644
--- a/src/plugins/scenegraph/d3d12/qsgd3d12engine_p_p.h
+++ b/src/plugins/scenegraph/d3d12/qsgd3d12engine_p_p.h
@@ -105,6 +105,7 @@ public:
 
     struct DeviceLossObserver {
         virtual void deviceLost() = 0;
+        virtual ~DeviceLossObserver() = default;
     };
     void registerDeviceLossObserver(DeviceLossObserver *observer);
 
diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12renderer.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12renderer.cpp
index c0f111ee83..c38c616ae6 100644
--- a/src/plugins/scenegraph/d3d12/qsgd3d12renderer.cpp
+++ b/src/plugins/scenegraph/d3d12/qsgd3d12renderer.cpp
@@ -69,10 +69,10 @@ public:
 
 QSGD3D12Renderer::QSGD3D12Renderer(QSGRenderContext *context)
     : QSGRenderer(context),
-      m_renderList(16),
       m_vboData(1024),
       m_iboData(256),
-      m_cboData(4096)
+      m_cboData(4096),
+      m_renderList(16)
 {
     setNodeUpdater(new DummyUpdater);
 }
@@ -447,10 +447,10 @@ void QSGD3D12Renderer::renderElements()
 struct RenderNodeState : public QSGRenderNode::RenderState
 {
     const QMatrix4x4 *projectionMatrix() const override { return m_projectionMatrix; }
-    QRect scissorRect() const { return m_scissorRect; }
-    bool scissorEnabled() const { return m_scissorEnabled; }
-    int stencilValue() const { return m_stencilValue; }
-    bool stencilEnabled() const { return m_stencilEnabled; }
+    QRect scissorRect() const override { return m_scissorRect; }
+    bool scissorEnabled() const override { return m_scissorEnabled; }
+    int stencilValue() const override { return m_stencilValue; }
+    bool stencilEnabled() const override { return m_stencilEnabled; }
     const QRegion *clipRegion() const override { return nullptr; }
 
     const QMatrix4x4 *m_projectionMatrix;
diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp
index 62771eb8f9..b4fb721a8b 100644
--- a/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp
+++ b/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp
@@ -171,7 +171,7 @@ void QSGD3D12ShaderLinker::linkTextureSubRects()
     // texture bind point.
     for (Constant &c : constants) {
         if (c.specialType == QSGShaderEffectNode::VariableData::SubRect) {
-            if (c.value.type() == QMetaType::QByteArray) {
+            if (c.value.type() == QVariant::ByteArray) {
                 const QByteArray name = c.value.toByteArray();
                 if (!textureNameMap.contains(name))
                     qWarning("ShaderEffect: qt_SubRect_%s refers to unknown source texture", qPrintable(name));