Merge remote-tracking branch 'origin/dev' into HEAD

Conflicts:
	src/qml/compiler/qv4codegen.cpp
	src/qml/compiler/qv4compileddata.cpp
	src/qml/compiler/qv4compileddata_p.h
	src/qml/compiler/qv4isel_moth_p.h
	src/qml/compiler/qv4ssa.cpp
	src/qml/jit/qv4assembler_p.h
	src/qml/jit/qv4isel_masm_p.h
	src/qml/jit/qv4regalloc.cpp
	src/qml/jsruntime/qv4engine.cpp
	src/qml/jsruntime/qv4qmlcontext_p.h
	src/qml/jsruntime/qv4regexp.cpp
	src/qml/jsruntime/qv4regexp_p.h
	src/qml/jsruntime/qv4regexpobject.cpp
	src/qml/jsruntime/qv4runtime.cpp
	src/qml/jsruntime/qv4vme_moth.cpp
	src/qml/qml/v8/qqmlbuiltinfunctions.cpp
	tests/auto/qml/qml.pro
	tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
	tools/qmlcachegen/qmlcachegen.cpp

Change-Id: I1577e195c736f3414089036b957a01cb91a3ca23

16 files changed, 106 insertions, 87 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h
index 2e40eb4de8..c0c24058eb 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h
+++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h
@@ -95,17 +95,17 @@ public:
         bool hasNotifySignal;
     };
 
-    void engineAboutToBeAdded(QJSEngine *) Q_DECL_OVERRIDE;
-    void engineAboutToBeRemoved(QJSEngine *) Q_DECL_OVERRIDE;
-    void objectCreated(QJSEngine *, QObject *) Q_DECL_OVERRIDE;
+    void engineAboutToBeAdded(QJSEngine *) override;
+    void engineAboutToBeRemoved(QJSEngine *) override;
+    void objectCreated(QJSEngine *, QObject *) override;
 
-    void setStatesDelegate(QQmlDebugStatesDelegate *) Q_DECL_OVERRIDE;
+    void setStatesDelegate(QQmlDebugStatesDelegate *) override;
 
 signals:
     void scheduleMessage(const QByteArray &);
 
 protected:
-    virtual void messageReceived(const QByteArray &) Q_DECL_OVERRIDE;
+    void messageReceived(const QByteArray &) override;
 
 private:
     friend class QQmlDebuggerServiceFactory;
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
index ef62774d66..b4216663ac 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
@@ -426,7 +426,7 @@ QV4::ReturnedValue QV4DataCollector::getValue(Ref ref)
     QV4::Scope scope(engine());
     QV4::ScopedObject array(scope, m_values.value());
     Q_ASSERT(ref < array->getLength());
-    return array->getIndexed(ref, Q_NULLPTR);
+    return array->getIndexed(ref, nullptr);
 }
 
 // TODO: Drop this method once we don't need to support namesAsObjects anymore
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.h b/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.h
index 42f4534015..4a755f2b72 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.h
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.h
@@ -129,14 +129,14 @@ public:
     void runInEngine(QV4DebugJob *job);
 
     // compile-time interface
-    void maybeBreakAtInstruction() Q_DECL_OVERRIDE;
+    void maybeBreakAtInstruction() override;
 
     // execution hooks
-    void enteringFunction() Q_DECL_OVERRIDE;
-    void leavingFunction(const QV4::ReturnedValue &retVal) Q_DECL_OVERRIDE;
-    void aboutToThrow() Q_DECL_OVERRIDE;
+    void enteringFunction() override;
+    void leavingFunction(const QV4::ReturnedValue &retVal) override;
+    void aboutToThrow() override;
 
-    bool pauseAtNextOpportunity() const Q_DECL_OVERRIDE;
+    bool pauseAtNextOpportunity() const override;
 
 signals:
     void debuggerPaused(QV4Debugger *self, QV4Debugger::PauseReason reason);
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h
index bb13890ae4..8a01061ec2 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h
@@ -73,14 +73,14 @@ class QV4DebugServiceImpl : public QQmlConfigurableDebugService<QV4DebugService>
     Q_OBJECT
 public:
     explicit QV4DebugServiceImpl(QObject *parent = 0);
-    ~QV4DebugServiceImpl() Q_DECL_OVERRIDE;
+    ~QV4DebugServiceImpl() override;
 
-    void engineAdded(QJSEngine *engine) Q_DECL_OVERRIDE;
-    void engineAboutToBeRemoved(QJSEngine *engine) Q_DECL_OVERRIDE;
+    void engineAdded(QJSEngine *engine) override;
+    void engineAboutToBeRemoved(QJSEngine *engine) override;
 
-    void stateAboutToBeChanged(State state) Q_DECL_OVERRIDE;
+    void stateAboutToBeChanged(State state) override;
 
-    void signalEmitted(const QString &signal) Q_DECL_OVERRIDE;
+    void signalEmitted(const QString &signal) override;
     void send(QJsonObject v8Payload);
 
     int selectedFrame() const;
@@ -92,7 +92,7 @@ public:
     QV4DebuggerAgent debuggerAgent;
 
 protected:
-    void messageReceived(const QByteArray &) Q_DECL_OVERRIDE;
+    void messageReceived(const QByteArray &) override;
     void sendSomethingToSomebody(const char *type, int magicNumber = 1);
 
 private:
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.cpp b/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.cpp
index ab1aeebf64..d0d8d62615 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.cpp
@@ -51,15 +51,15 @@ class QQmlInspectorServiceImpl : public QQmlInspectorService
 public:
     QQmlInspectorServiceImpl(QObject *parent = 0);
 
-    void addWindow(QQuickWindow *window) Q_DECL_OVERRIDE;
-    void setParentWindow(QQuickWindow *window, QWindow *parent) Q_DECL_OVERRIDE;
-    void removeWindow(QQuickWindow *window) Q_DECL_OVERRIDE;
+    void addWindow(QQuickWindow *window) override;
+    void setParentWindow(QQuickWindow *window, QWindow *parent) override;
+    void removeWindow(QQuickWindow *window) override;
 
 signals:
     void scheduleMessage(const QByteArray &message);
 
 protected:
-    virtual void messageReceived(const QByteArray &) Q_DECL_OVERRIDE;
+    void messageReceived(const QByteArray &) override;
 
 private:
     friend class QQmlInspectorServiceFactory;
diff --git a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.h b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.h
index f8b7e1d527..a7f37b0f1e 100644
--- a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.h
+++ b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.h
@@ -51,16 +51,16 @@ class QQmlNativeDebugConnector : public QQmlDebugConnector
 
 public:
     QQmlNativeDebugConnector();
-    ~QQmlNativeDebugConnector() Q_DECL_OVERRIDE;
+    ~QQmlNativeDebugConnector() override;
 
-    bool blockingMode() const Q_DECL_OVERRIDE;
-    QQmlDebugService *service(const QString &name) const Q_DECL_OVERRIDE;
-    void addEngine(QJSEngine *engine) Q_DECL_OVERRIDE;
-    void removeEngine(QJSEngine *engine) Q_DECL_OVERRIDE;
-    bool hasEngine(QJSEngine *engine) const Q_DECL_OVERRIDE;
-    bool addService(const QString &name, QQmlDebugService *service) Q_DECL_OVERRIDE;
-    bool removeService(const QString &name) Q_DECL_OVERRIDE;
-    bool open(const QVariantHash &configuration) Q_DECL_OVERRIDE;
+    bool blockingMode() const override;
+    QQmlDebugService *service(const QString &name) const override;
+    void addEngine(QJSEngine *engine) override;
+    void removeEngine(QJSEngine *engine) override;
+    bool hasEngine(QJSEngine *engine) const override;
+    bool addService(const QString &name, QQmlDebugService *service) override;
+    bool removeService(const QString &name) override;
+    bool open(const QVariantHash &configuration) override;
     static void setDataStreamVersion(int version);
 
 private:
diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
index 1eaa2819af..cb5d2d4c1b 100644
--- a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
@@ -187,16 +187,16 @@ public:
 
     QV4::ExecutionEngine *engine() const { return m_engine; }
 
-    bool pauseAtNextOpportunity() const Q_DECL_OVERRIDE {
+    bool pauseAtNextOpportunity() const override {
         return m_pauseRequested
                 || m_service->m_breakHandler->m_haveBreakPoints
                 || m_stepping >= StepOver;
     }
 
-    void maybeBreakAtInstruction() Q_DECL_OVERRIDE;
-    void enteringFunction() Q_DECL_OVERRIDE;
-    void leavingFunction(const QV4::ReturnedValue &retVal) Q_DECL_OVERRIDE;
-    void aboutToThrow() Q_DECL_OVERRIDE;
+    void maybeBreakAtInstruction() override;
+    void enteringFunction() override;
+    void leavingFunction(const QV4::ReturnedValue &retVal) override;
+    void aboutToThrow() override;
 
     void handleCommand(QJsonObject *response, const QString &cmd, const QJsonObject &arguments);
 
diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.h b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.h
index 58bf1bc94a..4b4661be2f 100644
--- a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.h
+++ b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.h
@@ -73,14 +73,14 @@ class QQmlNativeDebugServiceImpl : public QQmlNativeDebugService
 public:
     QQmlNativeDebugServiceImpl(QObject *parent);
 
-    ~QQmlNativeDebugServiceImpl() Q_DECL_OVERRIDE;
+    ~QQmlNativeDebugServiceImpl() override;
 
-    void engineAboutToBeAdded(QJSEngine *engine) Q_DECL_OVERRIDE;
-    void engineAboutToBeRemoved(QJSEngine *engine) Q_DECL_OVERRIDE;
+    void engineAboutToBeAdded(QJSEngine *engine) override;
+    void engineAboutToBeRemoved(QJSEngine *engine) override;
 
-    void stateAboutToBeChanged(State state) Q_DECL_OVERRIDE;
+    void stateAboutToBeChanged(State state) override;
 
-    void messageReceived(const QByteArray &message) Q_DECL_OVERRIDE;
+    void messageReceived(const QByteArray &message) override;
 
     void emitAsynchronousMessageToClient(const QJsonObject &message);
 
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.h b/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.h
index 6392944519..3c5daa0f4f 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.h
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.h
@@ -81,15 +81,15 @@ protected:
     QList<QJSEngine *> stoppingEngines;
     bool blockingMode;
 
-    void messageReceived(const QByteArray &) Q_DECL_OVERRIDE;
-    void engineAboutToBeAdded(QJSEngine *) Q_DECL_OVERRIDE;
-    void engineAboutToBeRemoved(QJSEngine *) Q_DECL_OVERRIDE;
-    void engineAdded(QJSEngine *) Q_DECL_OVERRIDE;
-    void engineRemoved(QJSEngine *) Q_DECL_OVERRIDE;
+    void messageReceived(const QByteArray &) override;
+    void engineAboutToBeAdded(QJSEngine *) override;
+    void engineAboutToBeRemoved(QJSEngine *) override;
+    void engineAdded(QJSEngine *) override;
+    void engineRemoved(QJSEngine *) override;
 
     void sendMessage(MessageType type, QJSEngine *engine);
 
-    void stateChanged(State) Q_DECL_OVERRIDE;
+    void stateChanged(State) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
index 510c745d4e..d676731ba7 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
@@ -44,24 +44,36 @@
 
 QT_BEGIN_NAMESPACE
 
-QQmlProfilerAdapter::QQmlProfilerAdapter(QQmlProfilerService *service, QQmlEnginePrivate *engine) :
-    next(0)
+QQmlProfilerAdapter::QQmlProfilerAdapter(QQmlProfilerService *service, QQmlEnginePrivate *engine)
 {
-    setService(service);
     engine->profiler = new QQmlProfiler;
+    init(service, engine->profiler);
+}
+
+QQmlProfilerAdapter::QQmlProfilerAdapter(QQmlProfilerService *service, QQmlTypeLoader *loader)
+{
+    QQmlProfiler *profiler = new QQmlProfiler;
+    loader->setProfiler(profiler);
+    init(service, profiler);
+}
+
+void QQmlProfilerAdapter::init(QQmlProfilerService *service, QQmlProfiler *profiler)
+{
+    next = 0;
+    setService(service);
     connect(this, &QQmlProfilerAdapter::profilingEnabled,
-            engine->profiler, &QQmlProfiler::startProfiling);
+            profiler, &QQmlProfiler::startProfiling);
     connect(this, &QQmlAbstractProfilerAdapter::profilingEnabledWhileWaiting,
-            engine->profiler, &QQmlProfiler::startProfiling, Qt::DirectConnection);
+            profiler, &QQmlProfiler::startProfiling, Qt::DirectConnection);
     connect(this, &QQmlAbstractProfilerAdapter::profilingDisabled,
-            engine->profiler, &QQmlProfiler::stopProfiling);
+            profiler, &QQmlProfiler::stopProfiling);
     connect(this, &QQmlAbstractProfilerAdapter::profilingDisabledWhileWaiting,
-            engine->profiler, &QQmlProfiler::stopProfiling, Qt::DirectConnection);
+            profiler, &QQmlProfiler::stopProfiling, Qt::DirectConnection);
     connect(this, &QQmlAbstractProfilerAdapter::dataRequested,
-            engine->profiler, &QQmlProfiler::reportData);
+            profiler, &QQmlProfiler::reportData);
     connect(this, &QQmlAbstractProfilerAdapter::referenceTimeKnown,
-            engine->profiler, &QQmlProfiler::setTimer);
-    connect(engine->profiler, &QQmlProfiler::dataReady,
+            profiler, &QQmlProfiler::setTimer);
+    connect(profiler, &QQmlProfiler::dataReady,
             this, &QQmlProfilerAdapter::receiveData);
 }
 
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.h b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.h
index 1fee5c389f..b14b72d254 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.h
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.h
@@ -60,13 +60,15 @@ class QQmlProfilerAdapter : public QQmlAbstractProfilerAdapter {
     Q_OBJECT
 public:
     QQmlProfilerAdapter(QQmlProfilerService *service, QQmlEnginePrivate *engine);
+    QQmlProfilerAdapter(QQmlProfilerService *service, QQmlTypeLoader *loader);
     qint64 sendMessages(qint64 until, QList<QByteArray> &messages,
-                        bool trackLocations) Q_DECL_OVERRIDE;
+                        bool trackLocations) override;
 
     void receiveData(const QVector<QQmlProfilerData> &new_data,
                      const QQmlProfiler::LocationHash &locations);
 
 private:
+    void init(QQmlProfilerService *service, QQmlProfiler *profiler);
     QVector<QQmlProfilerData> data;
     QQmlProfiler::LocationHash locations;
     int next;
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
index edeb364f60..4176ede40e 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
@@ -119,9 +119,12 @@ void QQmlProfilerServiceImpl::engineAboutToBeAdded(QJSEngine *engine)
 
     QMutexLocker lock(&m_configMutex);
     if (QQmlEngine *qmlEngine = qobject_cast<QQmlEngine *>(engine)) {
-        QQmlProfilerAdapter *qmlAdapter =
-                new QQmlProfilerAdapter(this, QQmlEnginePrivate::get(qmlEngine));
+        QQmlEnginePrivate *enginePrivate = QQmlEnginePrivate::get(qmlEngine);
+        QQmlProfilerAdapter *qmlAdapter = new QQmlProfilerAdapter(this, enginePrivate);
         addEngineProfiler(qmlAdapter, engine);
+        QQmlProfilerAdapter *compileAdapter
+                = new QQmlProfilerAdapter(this, &(enginePrivate->typeLoader));
+        addEngineProfiler(compileAdapter, engine);
     }
     QV4ProfilerAdapter *v4Adapter = new QV4ProfilerAdapter(this, QV8Engine::getV4(engine->handle()));
     addEngineProfiler(v4Adapter, engine);
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h
index bbfc32b681..e6f89e850a 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h
@@ -78,30 +78,30 @@ class QQmlProfilerServiceImpl :
     Q_OBJECT
 public:
 
-    void engineAboutToBeAdded(QJSEngine *engine) Q_DECL_OVERRIDE;
-    void engineAboutToBeRemoved(QJSEngine *engine) Q_DECL_OVERRIDE;
-    void engineAdded(QJSEngine *engine) Q_DECL_OVERRIDE;
-    void engineRemoved(QJSEngine *engine) Q_DECL_OVERRIDE;
+    void engineAboutToBeAdded(QJSEngine *engine) override;
+    void engineAboutToBeRemoved(QJSEngine *engine) override;
+    void engineAdded(QJSEngine *engine) override;
+    void engineRemoved(QJSEngine *engine) override;
 
-    void addGlobalProfiler(QQmlAbstractProfilerAdapter *profiler) Q_DECL_OVERRIDE;
-    void removeGlobalProfiler(QQmlAbstractProfilerAdapter *profiler) Q_DECL_OVERRIDE;
+    void addGlobalProfiler(QQmlAbstractProfilerAdapter *profiler) override;
+    void removeGlobalProfiler(QQmlAbstractProfilerAdapter *profiler) override;
 
     void startProfiling(QJSEngine *engine,
-                        quint64 features = std::numeric_limits<quint64>::max()) Q_DECL_OVERRIDE;
-    void stopProfiling(QJSEngine *engine) Q_DECL_OVERRIDE;
+                        quint64 features = std::numeric_limits<quint64>::max()) override;
+    void stopProfiling(QJSEngine *engine) override;
 
     QQmlProfilerServiceImpl(QObject *parent = 0);
-    ~QQmlProfilerServiceImpl() Q_DECL_OVERRIDE;
+    ~QQmlProfilerServiceImpl() override;
 
-    void dataReady(QQmlAbstractProfilerAdapter *profiler) Q_DECL_OVERRIDE;
+    void dataReady(QQmlAbstractProfilerAdapter *profiler) override;
 
 signals:
     void startFlushTimer();
     void stopFlushTimer();
 
 protected:
-    virtual void stateAboutToBeChanged(State state) Q_DECL_OVERRIDE;
-    virtual void messageReceived(const QByteArray &) Q_DECL_OVERRIDE;
+    void stateAboutToBeChanged(State state) override;
+    void messageReceived(const QByteArray &) override;
 
 private:
     friend class QQmlProfilerServiceFactory;
diff --git a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
index 0a7421842a..59848ceb82 100644
--- a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
+++ b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
@@ -131,19 +131,19 @@ class QQmlDebugServerImpl : public QQmlDebugServer
 public:
     QQmlDebugServerImpl();
 
-    bool blockingMode() const Q_DECL_OVERRIDE;
+    bool blockingMode() const override;
 
-    QQmlDebugService *service(const QString &name) const Q_DECL_OVERRIDE;
+    QQmlDebugService *service(const QString &name) const override;
 
-    void addEngine(QJSEngine *engine) Q_DECL_OVERRIDE;
-    void removeEngine(QJSEngine *engine) Q_DECL_OVERRIDE;
-    bool hasEngine(QJSEngine *engine) const Q_DECL_OVERRIDE;
+    void addEngine(QJSEngine *engine) override;
+    void removeEngine(QJSEngine *engine) override;
+    bool hasEngine(QJSEngine *engine) const override;
 
-    bool addService(const QString &name, QQmlDebugService *service) Q_DECL_OVERRIDE;
-    bool removeService(const QString &name) Q_DECL_OVERRIDE;
+    bool addService(const QString &name, QQmlDebugService *service) override;
+    bool removeService(const QString &name) override;
 
-    bool open(const QVariantHash &configuration) Q_DECL_OVERRIDE;
-    void setDevice(QIODevice *socket) Q_DECL_OVERRIDE;
+    bool open(const QVariantHash &configuration) override;
+    void setDevice(QIODevice *socket) override;
 
     void parseArguments();
 
diff --git a/src/plugins/qmltooling/qmltooling.pro b/src/plugins/qmltooling/qmltooling.pro
index 27c51b53c8..5895169ca0 100644
--- a/src/plugins/qmltooling/qmltooling.pro
+++ b/src/plugins/qmltooling/qmltooling.pro
@@ -19,17 +19,19 @@ qtConfig(qml-network) {
         qmldbg_tcp
 }
 
+# Services
+SUBDIRS += \
+    qmldbg_messages \
+    qmldbg_profiler
+qmldbg_messages.depends = packetprotocol
+qmldbg_profiler.depends = packetprotocol
+
 qtConfig(qml-interpreter) {
-    # Services
     SUBDIRS += \
         qmldbg_debugger \
-        qmldbg_profiler \
-        qmldbg_messages \
         qmldbg_nativedebugger
 
     qmldbg_debugger.depends = packetprotocol
-    qmldbg_profiler.depends = packetprotocol
-    qmldbg_messages.depends = packetprotocol
     qmldbg_nativedebugger.depends = packetprotocol
 }
 
diff --git a/src/plugins/qmltooling/shared/qqmlconfigurabledebugservice.h b/src/plugins/qmltooling/shared/qqmlconfigurabledebugservice.h
index 85ff9b182f..89ac734e05 100644
--- a/src/plugins/qmltooling/shared/qqmlconfigurabledebugservice.h
+++ b/src/plugins/qmltooling/shared/qqmlconfigurabledebugservice.h
@@ -85,7 +85,7 @@ protected:
                                      QQmlDebugConnector::instance()->blockingMode());
     }
 
-    void stateChanged(QQmlDebugService::State newState) Q_DECL_OVERRIDE
+    void stateChanged(QQmlDebugService::State newState) override
     {
         if (newState != QQmlDebugService::Enabled)
             stopWaiting();
@@ -93,7 +93,7 @@ protected:
             init();
     }
 
-    void engineAboutToBeAdded(QJSEngine *engine) Q_DECL_OVERRIDE
+    void engineAboutToBeAdded(QJSEngine *engine) override
     {
         QMutexLocker lock(&m_configMutex);
         if (m_waitingForConfiguration)