summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSona Kurazyan <sona.kurazyan@qt.io>2019-06-25 10:00:11 +0200
committerSona Kurazyan <sona.kurazyan@qt.io>2019-06-25 10:00:11 +0200
commit9822df545cf1aaad684cb6179b214952a4027b71 (patch)
tree059d99da588984597a93db52a3522c5c1036f812 /src
parent112de18b3cdec275d3459bf401ff73cf9dedd116 (diff)
Remove usages of deprecated QLatin1Literal
Task-number: QTBUG-76491 Change-Id: I8f96c049e134843e4eb2bffef6274497eca8b5cf Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/client/qwaylandintegration.cpp2
-rw-r--r--src/compositor/extensions/qwltexturesharingextension.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
index e75aebd9e..078e5be19 100644
--- a/src/client/qwaylandintegration.cpp
+++ b/src/client/qwaylandintegration.cpp
@@ -346,7 +346,7 @@ void QWaylandIntegration::initializeClientBufferIntegration()
&& mDisplay->hardwareIntegration()->clientBufferIntegration() != QLatin1String("linux-dmabuf-unstable-v1")) {
targetKey = mDisplay->hardwareIntegration()->clientBufferIntegration();
} else {
- targetKey = QLatin1Literal("wayland-egl");
+ targetKey = QLatin1String("wayland-egl");
}
}
diff --git a/src/compositor/extensions/qwltexturesharingextension.cpp b/src/compositor/extensions/qwltexturesharingextension.cpp
index 251c5fec0..cf9fd0116 100644
--- a/src/compositor/extensions/qwltexturesharingextension.cpp
+++ b/src/compositor/extensions/qwltexturesharingextension.cpp
@@ -177,7 +177,7 @@ public:
return new SharedTextureFactory(m_buffer);
}
// qDebug() << "Shared buffer NOT found for" << m_id;
- m_errorString = QLatin1Literal("Shared buffer not found");
+ m_errorString = QLatin1String("Shared buffer not found");
return nullptr;
}
@@ -282,7 +282,7 @@ void QWaylandTextureSharingExtension::initialize()
setImageSearchPath(image_search_path);
if (m_image_dirs.isEmpty())
- m_image_dirs << QLatin1Literal(":/") << QLatin1Literal("./");
+ m_image_dirs << QLatin1String(":/") << QLatin1String("./");
auto suffixes = QTextureFileReader::supportedFileFormats();
suffixes.append(QImageReader::supportedImageFormats());
@@ -295,7 +295,7 @@ void QWaylandTextureSharingExtension::initialize()
if (ctx) {
QQmlEngine *engine = ctx->engine();
if (engine) {
- auto *provider = static_cast<QWaylandSharedTextureProvider*>(engine->imageProvider(QLatin1Literal("wlshared")));
+ auto *provider = static_cast<QWaylandSharedTextureProvider*>(engine->imageProvider(QLatin1String("wlshared")));
if (provider)
provider->setExtensionReady(this);
}
@@ -308,7 +308,7 @@ QString QWaylandTextureSharingExtension::getExistingFilePath(const QString &key)
// paths containing '../'. We handle that here, at the price of also blocking directory
// names ending with two or more dots.
- if (key.contains(QLatin1Literal("../")))
+ if (key.contains(QLatin1String("../")))
return QString();
for (auto dir : m_image_dirs) {