Merge master into api_changes

Conflicts:
	src/qml/debugger/qqmlenginedebugservice.cpp
	src/qml/qml/v8/qv8qobjectwrapper.cpp
	src/quick/util/qquickimageprovider.cpp
	tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp

Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb

1 files changed, 2 insertions, 2 deletions

diff --git a/src/qml/debugger/qqmldebugservice.cpp b/src/qml/debugger/qqmldebugservice.cpp
index a1cc4fe0a3..45948490cf 100644
--- a/src/qml/debugger/qqmldebugservice.cpp
+++ b/src/qml/debugger/qqmldebugservice.cpp
@@ -216,11 +216,11 @@ bool QQmlDebugService::hasDebuggingClient()
 QString QQmlDebugService::objectToString(QObject *obj)
 {
     if(!obj)
-        return QLatin1String("NULL");
+        return QStringLiteral("NULL");
 
     QString objectName = obj->objectName();
     if(objectName.isEmpty())
-        objectName = QLatin1String("<unnamed>");
+        objectName = QStringLiteral("<unnamed>");
 
     QString rv = QString::fromUtf8(obj->metaObject()->className()) +
             QLatin1String(": ") + objectName;