diff options
| author | Marco Bubke <marco.bubke@qt.io> | 2020-08-12 13:18:24 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-08-13 06:24:10 +0000 |
| commit | dc870f538dd3e11464a3ece179edf024161e14ba (patch) | |
| tree | 9952b363e9c5ca476d9cbd3891523e42b3801037 /src/plugins/qmldesigner/designercore | |
| parent | 208ebd60437666515a4d64b7792a156952ebbc55 (diff) | |
Prepare merge of qds-1.59 to 4.13qds-1.59
It is not compiling but we are closing this branch anyway.
Change-Id: If96318175d92ae492871d668d5c937c473fd05d5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/designercore')
6 files changed, 9 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp b/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp index 0d4540b37f..b7a2cc282e 100644 --- a/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp +++ b/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp @@ -29,6 +29,7 @@ #include "nodeinstanceview.h" #include <QLocalSocket> +#include <QTimer> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.cpp b/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.cpp index b6e81f1ffe..4be52a327c 100644 --- a/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.cpp +++ b/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.cpp @@ -27,6 +27,10 @@ #include <coreplugin/messagebox.h> +#include <QCoreApplication> +#include <QDebug> +#include <QTimer> + namespace QmlDesigner { void CapturingConnectionManager::setUp(NodeInstanceServerProxy *nodeInstanceServerProxy, diff --git a/src/plugins/qmldesigner/designercore/instances/connectionmanager.cpp b/src/plugins/qmldesigner/designercore/instances/connectionmanager.cpp index edf7f20b9c..fa8528579d 100644 --- a/src/plugins/qmldesigner/designercore/instances/connectionmanager.cpp +++ b/src/plugins/qmldesigner/designercore/instances/connectionmanager.cpp @@ -37,6 +37,7 @@ #include <QLocalServer> #include <QLocalSocket> +#include <QTimer> #include <QUuid> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/designercore/instances/connectionmanagerinterface.cpp b/src/plugins/qmldesigner/designercore/instances/connectionmanagerinterface.cpp index 2aa7df6be6..b4fdb70794 100644 --- a/src/plugins/qmldesigner/designercore/instances/connectionmanagerinterface.cpp +++ b/src/plugins/qmldesigner/designercore/instances/connectionmanagerinterface.cpp @@ -27,6 +27,7 @@ #include <QLocalSocket> #include <QProcess> +#include <QTimer> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/designercore/instances/connectionmanagerinterface.h b/src/plugins/qmldesigner/designercore/instances/connectionmanagerinterface.h index f3d8e6293e..92d7449bc0 100644 --- a/src/plugins/qmldesigner/designercore/instances/connectionmanagerinterface.h +++ b/src/plugins/qmldesigner/designercore/instances/connectionmanagerinterface.h @@ -26,6 +26,7 @@ #include "qprocessuniqueptr.h" #include <qmldesignercorelib_global.h> +#include <QTimer> QT_BEGIN_NAMESPACE class QLocalSocket; diff --git a/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp b/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp index 4b6c73f19e..6da44603df 100644 --- a/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp +++ b/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp @@ -32,6 +32,7 @@ #include <coreplugin/messagebox.h> #include <QLocalSocket> +#include <QTimer> namespace QmlDesigner { |