Merge master into api_changes

Conflicts:
	src/qml/debugger/qqmlenginedebugservice.cpp
	src/qml/debugger/qqmlprofilerservice_p.h
	src/qml/qml/qqmlboundsignal.cpp
	src/qml/qml/qqmlpropertycache.cpp
	src/quick/util/qquickimageprovider.cpp

Change-Id: I0609aa5ed54c7769f1e2773a96a7cd43a69f133c

1 files changed, 23 insertions, 10 deletions

diff --git a/src/qml/debugger/qqmlprofilerservice_p.h b/src/qml/debugger/qqmlprofilerservice_p.h
index 2b4cafb615..2e351792cc 100644
--- a/src/qml/debugger/qqmlprofilerservice_p.h
+++ b/src/qml/debugger/qqmlprofilerservice_p.h
@@ -205,16 +205,16 @@ struct QQmlHandlingSignalProfiler {
     {
         enabled = QQmlProfilerService::instance
                 ? QQmlProfilerService::instance->profilingEnabled() : false;
-        if (enabled) {
-            QQmlProfilerService *service = QQmlProfilerService::instance;
-            service->startRange(QQmlProfilerService::HandlingSignal);
-            service->rangeData(QQmlProfilerService::HandlingSignal,
-                               QString::fromLatin1(signal.methodSignature()) + QLatin1String(": ")
-                               + expression->expression());
-            service->rangeLocation(QQmlProfilerService::HandlingSignal,
-                                   expression->sourceFile(), expression->lineNumber(),
-                                   expression->columnNumber());
-        }
+        if (enabled)
+            init(signal, expression);
+    }
+
+    QQmlHandlingSignalProfiler(QObject *object, int index, QQmlExpression *expression)
+    {
+        enabled = QQmlProfilerService::instance
+                ? QQmlProfilerService::instance->profilingEnabled() : false;
+        if (enabled)
+            init(object->metaObject()->method(index), expression);
     }
 
     ~QQmlHandlingSignalProfiler()
@@ -224,6 +224,19 @@ struct QQmlHandlingSignalProfiler {
     }
 
     bool enabled;
+
+private:
+    void init(const QMetaMethod &signal, QQmlExpression *expression)
+    {
+        QQmlProfilerService *service = QQmlProfilerService::instance;
+        service->startRange(QQmlProfilerService::HandlingSignal);
+        service->rangeData(QQmlProfilerService::HandlingSignal,
+                           QString::fromLatin1(signal.methodSignature()) + QLatin1String(": ")
+                           + expression->expression());
+        service->rangeLocation(QQmlProfilerService::HandlingSignal,
+                               expression->sourceFile(), expression->lineNumber(),
+                               expression->columnNumber());
+    }
 };
 
 struct QQmlObjectCreatingProfiler {