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

Conflicts:
	src/imports/dialogs/qquickmessagedialog.cpp
	src/imports/dialogs/qquickmessagedialog_p.h
	src/qml/debugger/qqmlprofilerservice_p.h
	src/qml/jsruntime/qv4regexpobject.cpp
	tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro

Change-Id: Ic8a43366b44d6970966acbf03b206d0dee00c28d

1 files changed, 15 insertions, 2 deletions

diff --git a/src/qml/debugger/qqmlprofilerservice_p.h b/src/qml/debugger/qqmlprofilerservice_p.h
index 6d7c0dcb51..c3329dbb89 100644
--- a/src/qml/debugger/qqmlprofilerservice_p.h
+++ b/src/qml/debugger/qqmlprofilerservice_p.h
@@ -57,6 +57,7 @@
 #include <private/qqmlboundsignal_p.h>
 // this contains QUnifiedTimer
 #include <private/qabstractanimation_p.h>
+#include <private/qv4function_p.h>
 
 #include <QtCore/qelapsedtimer.h>
 #include <QtCore/qmetaobject.h>
@@ -401,8 +402,20 @@ struct QQmlBindingProfiler {
 struct QQmlHandlingSignalProfiler {
     QQmlHandlingSignalProfiler(QQmlBoundSignalExpression *expression)
     {
-        Q_QML_PROFILE(startHandlingSignal(expression->sourceFile(), expression->lineNumber(),
-                                          expression->columnNumber()));
+        if (QQmlProfilerService::enabled) {
+            if (expression->sourceFile().isEmpty()) {
+                QV4::Function *function = expression->function();
+                if (function) {
+                    Q_QML_PROFILE(startHandlingSignal(
+                            function->sourceFile(), function->compiledFunction->location.line,
+                            function->compiledFunction->location.column));
+                }
+            } else {
+                Q_QML_PROFILE(startHandlingSignal(
+                        expression->sourceFile(), expression->lineNumber(),
+                        expression->columnNumber()));
+            }
+        }
     }
 
     ~QQmlHandlingSignalProfiler()