File 0001-Fix-build-with-Qt-5.10-Use-QString-instead... of Package sddm

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-build-with-Qt-5.10-Use-QString-instead-of-QLatin.patch of Package sddm (Revision 28bc354f0c4287885034985e0be1c8a4)

Currently displaying revision 28bc354f0c4287885034985e0be1c8a4 , Show latest

From be2f6c82c67a5511b56af66bfe77970c9f72a8c1 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Thu, 22 Mar 2018 09:54:49 +0100
Subject: [PATCH] Fix build with Qt < 5.10: Use QString instead of
 QLatin1String

QLatin1String only got more QString-like with Qt 5.10, so we can't use
those methods.
---
 src/greeter/GreeterApp.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/greeter/GreeterApp.cpp b/src/greeter/GreeterApp.cpp
index 5181e4e..baeb982 100644
--- a/src/greeter/GreeterApp.cpp
+++ b/src/greeter/GreeterApp.cpp
@@ -281,24 +281,24 @@ int main(int argc, char **argv)
     // We set an attribute based on the platform we run on.
     // We only know the platform after we constructed QGuiApplication
     // though, so we need to find it out ourselves.
-    QLatin1String platform;
+    QString platform;
     for (int i = 1; i < argc - 1; ++i) {
         if(qstrcmp(argv[i], "-platform") == 0) {
-            platform = QLatin1String(argv[i + 1]);
+            platform = QString::fromUtf8(argv[i + 1]);
         }
     }
     if (platform.isEmpty()) {
-        platform = QLatin1String(qgetenv("QT_QPA_PLATFORM"));
+        platform = QString::fromUtf8(qgetenv("QT_QPA_PLATFORM"));
     }
     if (platform.isEmpty()) {
-        platform = QLatin1String("xcb");
+        platform = QStringLiteral("xcb");
     }
 
     // HiDPI
     bool hiDpiEnabled = false;
-    if (platform == QLatin1String("xcb"))
+    if (platform == QStringLiteral("xcb"))
         hiDpiEnabled = SDDM::mainConfig.X11.EnableHiDPI.get();
-    else if (platform.startsWith(QLatin1String("wayland")))
+    else if (platform.startsWith(QStringLiteral("wayland")))
         hiDpiEnabled = SDDM::mainConfig.Wayland.EnableHiDPI.get();
     if (hiDpiEnabled) {
         qDebug() << "High-DPI autoscaling Enabled";
-- 
2.16.2

Places

File 0001-Fix-build-with-Qt-5.10-Use-QString-instead-of-QLatin.patch of Package sddm (Revision 28bc354f0c4287885034985e0be1c8a4)

Places