Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Change-Id: Ie2b9472ba925df6e6a74727d44d8179557072105

1 files changed, 3 insertions, 3 deletions

diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp
index b164517011..656c7dd515 100644
--- a/src/qml/qml/qqmlbinding.cpp
+++ b/src/qml/qml/qqmlbinding.cpp
@@ -517,9 +517,9 @@ QString QQmlBinding::expressionIdentifier() const
 {
     if (auto f = function()) {
         QString url = f->sourceFile();
-        quint16 lineNumber = f->compiledFunction->location.line;
-        quint16 columnNumber = f->compiledFunction->location.column;
-        return url + QString::asprintf(":%u:%u", uint(lineNumber), uint(columnNumber));
+        uint lineNumber = f->compiledFunction->location.line;
+        uint columnNumber = f->compiledFunction->location.column;
+        return url + QString::asprintf(":%u:%u", lineNumber, columnNumber);
     }
 
     return QStringLiteral("[native code]");