Merge remote-tracking branch 'origin/5.8' into 5.9

Conflicts:
	src/qml/compiler/qv4ssa.cpp
	src/quick/accessible/qaccessiblequickview_p.h
	src/quick/items/qquickmousearea.cpp
	src/quick/util/qquickanimatorjob.cpp
	tools/qmlplugindump/main.cpp

Change-Id: I84474cf39895b9b757403971d2e9196e8c9d1809

2 files changed, 12 insertions, 8 deletions

diff --git a/src/qml/debugger/qqmldebugserviceinterfaces_p.h b/src/qml/debugger/qqmldebugserviceinterfaces_p.h
index 2fe3a588c3..707ef1a937 100644
--- a/src/qml/debugger/qqmldebugserviceinterfaces_p.h
+++ b/src/qml/debugger/qqmldebugserviceinterfaces_p.h
@@ -67,13 +67,15 @@ class QQuickWindow;
 
 #ifdef QT_NO_QML_DEBUGGER
 
-struct QV4DebugService
+class QV4DebugService
 {
+public:
     void signalEmitted(const QString &) {}
 };
 
-struct QQmlProfilerService
+class QQmlProfilerService
 {
+public:
     void startProfiling(QJSEngine *engine, quint64 features = std::numeric_limits<quint64>::max())
     {
         Q_UNUSED(engine);
@@ -83,21 +85,23 @@ struct QQmlProfilerService
     void stopProfiling(QJSEngine *) {}
 };
 
-struct QQmlEngineDebugService
+class QQmlEngineDebugService
 {
+public:
     void objectCreated(QJSEngine *, QObject *) {}
     virtual void setStatesDelegate(QQmlDebugStatesDelegate *) {}
 };
 
-struct QQmlInspectorService {
+class QQmlInspectorService {
+public:
     void addWindow(QQuickWindow *) {}
     void setParentWindow(QQuickWindow *, QWindow *) {}
     void removeWindow(QQuickWindow *) {}
 };
 
-struct QDebugMessageService {};
-struct QQmlEngineControlService {};
-struct QQmlNativeDebugService {};
+class QDebugMessageService {};
+class QQmlEngineControlService {};
+class QQmlNativeDebugService {};
 
 #else
 
diff --git a/src/qml/debugger/qqmlprofiler_p.h b/src/qml/debugger/qqmlprofiler_p.h
index 41fb2c5b7b..88f8e94f25 100644
--- a/src/qml/debugger/qqmlprofiler_p.h
+++ b/src/qml/debugger/qqmlprofiler_p.h
@@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
 #define Q_QML_PROFILE(feature, profiler, Method)
 #define Q_QML_OC_PROFILE(member, Code)
 
-struct QQmlProfiler {};
+class QQmlProfiler {};
 
 struct QQmlBindingProfiler
 {