aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2014-03-26 09:52:04 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-27 09:31:47 +0100
commitf170110023bb97e3c8f5c04ea70cdfbeaef19380 (patch)
tree5c4c0f6392429011dd186ef15a636b047820ce09
parent30f0b9a7fec30d81b58cf02d21bcd82d152ff0c8 (diff)
Fix warnings about deprecated construction of QStrings from ASCII.
items\qquickimagebase.cpp(322) : warning C4996: 'QString::QString': was declared deprecated items\qquickimagebase.cpp(342) : warning C4996: 'QString::QString': was declared deprecated Change-Id: I550a13680d54ef2c3734151f56ea56ac8b9f3b9b Reviewed-by: Alan Alpert <aalpert@blackberry.com>
-rw-r--r--src/quick/items/qquickimagebase.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickimagebase.cpp b/src/quick/items/qquickimagebase.cpp
index edd6faa569..66a56cc8bf 100644
--- a/src/quick/items/qquickimagebase.cpp
+++ b/src/quick/items/qquickimagebase.cpp
@@ -319,7 +319,7 @@ static QString image2xPath(const QString &path)
const int dotIndex = path.lastIndexOf(QLatin1Char('.'));
if (dotIndex == -1)
return path;
- if (path.contains("@2x."))
+ if (path.contains(QLatin1String("@2x.")))
return path;
QString retinaPath = path;
@@ -339,7 +339,7 @@ void QQuickImageBase::resolve2xLocalFile(const QUrl &url, qreal targetDevicePixe
return;
// Special case: the url in the QML source refers directly to an "@2x" file.
- if (localFile.contains("@2x")) {
+ if (localFile.contains(QLatin1String("@2x"))) {
*sourceDevicePixelRatio = qreal(2.0);
return;
}