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

3 files changed, 58 insertions, 35 deletions

diff --git a/src/qml/debugger/qqmldebug.h b/src/qml/debugger/qqmldebug.h
index 8036032150..318e0bd71f 100644
--- a/src/qml/debugger/qqmldebug.h
+++ b/src/qml/debugger/qqmldebug.h
@@ -51,12 +51,14 @@ QT_BEGIN_NAMESPACE
 
 struct Q_QML_EXPORT QQmlDebuggingEnabler
 {
-    QQmlDebuggingEnabler();
+    QQmlDebuggingEnabler(bool printWarning = true);
 };
 
 // Execute code in constructor before first QQmlEngine is instantiated
-#if defined(QT_DECLARATIVE_DEBUG)
-static QQmlDebuggingEnabler qmlEnableDebuggingHelper;
+#if defined(QT_DECLARATIVE_DEBUG_NO_WARNING)
+static QQmlDebuggingEnabler qmlEnableDebuggingHelper(false);
+#elif defined(QT_DECLARATIVE_DEBUG)
+static QQmlDebuggingEnabler qmlEnableDebuggingHelper(true);
 #endif
 
 QT_END_NAMESPACE
diff --git a/src/qml/debugger/qqmlenginedebugservice.cpp b/src/qml/debugger/qqmlenginedebugservice.cpp
index 7f0bf7ca33..cd09b69e48 100644
--- a/src/qml/debugger/qqmlenginedebugservice.cpp
+++ b/src/qml/debugger/qqmlenginedebugservice.cpp
@@ -223,7 +223,7 @@ void QQmlEngineDebugService::buildObjectDump(QDataStream &message,
     
     int childrenCount = children.count();
     for (int ii = 0; ii < children.count(); ++ii) {
-        if (qobject_cast<QQmlContext*>(children[ii]) || QQmlBoundSignal::cast(children[ii]))
+        if (qobject_cast<QQmlContext*>(children[ii]))
             --childrenCount;
     }
 
@@ -235,19 +235,41 @@ void QQmlEngineDebugService::buildObjectDump(QDataStream &message,
         QObject *child = children.at(ii);
         if (qobject_cast<QQmlContext*>(child))
             continue;
-        QQmlBoundSignal *signal = QQmlBoundSignal::cast(child);
-        if (signal) {
-            if (!dumpProperties)
+         if (recur)
+             buildObjectDump(message, child, recur, dumpProperties);
+         else
+             message << objectData(child);
+    }
+
+    if (!dumpProperties) {
+        message << 0;
+        return;
+    }
+
+    QList<int> propertyIndexes;
+    for (int ii = 0; ii < object->metaObject()->propertyCount(); ++ii) {
+        if (object->metaObject()->property(ii).isScriptable())
+            propertyIndexes << ii;
+    }
+
+    QQmlData *ddata = QQmlData::get(object);
+    if (ddata && ddata->signalHandlers) {
+        QQmlAbstractBoundSignal *signalHandler = ddata->signalHandlers;
+
+        while (signalHandler) {
+            if (!dumpProperties) {
+                signalHandler = signalHandler->m_nextSignal;
                 continue;
+            }
             QQmlObjectProperty prop;
             prop.type = QQmlObjectProperty::SignalProperty;
             prop.hasNotifySignal = false;
-            QQmlExpression *expr = signal->expression();
+            QQmlExpression *expr = signalHandler->expression();
             if (expr) {
                 prop.value = expr->expression();
                 QObject *scope = expr->scopeObject();
                 if (scope) {
-                    QString methodName = QString::fromLatin1(scope->metaObject()->method(signal->index()).name());
+                    QString methodName = QString::fromLatin1(scope->metaObject()->method(signalHandler->index()).name());
                     if (!methodName.isEmpty()) {
                         prop.name = QLatin1String("on") + methodName[0].toUpper()
                                 + methodName.mid(1);
@@ -255,23 +277,9 @@ void QQmlEngineDebugService::buildObjectDump(QDataStream &message,
                 }
             }
             fakeProperties << prop;
-        } else {
-            if (recur)
-                buildObjectDump(message, child, recur, dumpProperties);
-            else
-                message << objectData(child);
-        }
-    }
 
-    if (!dumpProperties) {
-        message << 0;
-        return;
-    }
-
-    QList<int> propertyIndexes;
-    for (int ii = 0; ii < object->metaObject()->propertyCount(); ++ii) {
-        if (object->metaObject()->property(ii).isScriptable())
-            propertyIndexes << ii;
+            signalHandler = signalHandler->m_nextSignal;
+        }
     }
 
     message << propertyIndexes.size() + fakeProperties.count();
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 {