Fix deprecation warnings about constructing QString from const char*.

types/qqmlmodelindexvaluetype.cpp: In static member function 'static QString QQmlModelIndexValueType::propertiesString(const QModelIndex&)':
types/qqmlmodelindexvaluetype.cpp:47:56: warning: 'QString::QString(const char*)' is deprecated (declared at qstring.h:649) [-Wdeprecated-declarations]
items/qquickimagebase.cpp: In member function 'virtual void QQuickImageBase::load()':
items/qquickimagebase.cpp:213:49: warning: 'QString::QString(const char*)' is deprecated (declared at qstring.h:649) [-Wdeprecated-declarations]
items/qquickimagebase.cpp:213:88: warning: 'QString::QString(const char*)' is deprecated (declared at qstring.h:649) [-Wdeprecated-declarations]

Change-Id: I03266aba589ade8228bc286cd3f3f237cd06a780
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>

diff --git a/src/qml/types/qqmlmodelindexvaluetype.cpp b/src/qml/types/qqmlmodelindexvaluetype.cpp
index 03ae05b..a8900c6 100644 (file)
--- a/src/qml/types/qqmlmodelindexvaluetype.cpp
+++ b/src/qml/types/qqmlmodelindexvaluetype.cpp
@@ -44,7 +44,7 @@ QString QQmlModelIndexValueType::propertiesString(const QModelIndex &idx)
         return QLatin1String("()");
     return QString(QLatin1String("(%1,%2,0x%3,%4(0x%5))"))
             .arg(idx.row()).arg(idx.column()).arg(idx.internalId(), 0, 16)
-            .arg(idx.model()->metaObject()->className()).arg(quintptr(idx.model()), 0, 16);
+            .arg(QLatin1String(idx.model()->metaObject()->className())).arg(quintptr(idx.model()), 0, 16);
 }
 
 /*!

diff --git a/src/quick/items/qquickimagebase.cpp b/src/quick/items/qquickimagebase.cpp
index 688cf57..951532e 100644 (file)
--- a/src/quick/items/qquickimagebase.cpp
+++ b/src/quick/items/qquickimagebase.cpp
@@ -210,7 +210,8 @@ void QQuickImageBase::load()
 
         QUrl loadUrl = d->url;
         if (d->url.scheme() == QStringLiteral("image")
-            || d->url.toString().endsWith(".svg") || d->url.toString().endsWith(".svgz")) {
+            || d->url.toString().endsWith(QLatin1String(".svg"))
+            || d->url.toString().endsWith(QLatin1String(".svgz"))) {
             // QQuickImageProvider and SVG can generate a high resolution image when
             // sourceSize is set. If sourceSize is not set then the provider default size
             // will be used, as usual.