File 0001-Call-KLocalizedString-setApplicationDomain... of Package plasma5-workspace

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Call-KLocalizedString-setApplicationDomain-after-Q-A.patch of Package plasma5-workspace

From 6eb5d00b48a67b415c0770434dbb6bc8a0e6d9d9 Mon Sep 17 00:00:00 2001
From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
Date: Sat, 10 Feb 2018 00:34:10 +0100
Subject: [PATCH 1/3] Call KLocalizedString::setApplicationDomain after Q*App
 creation

As now recommended, to ensure all locale settings are done from Qt side
---
 klipper/main.cpp          | 2 +-
 krunner/main.cpp          | 3 +--
 shell/main.cpp            | 3 +--
 startkde/kcminit/main.cpp | 2 +-
 systemmonitor/main.cpp    | 3 +--
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/klipper/main.cpp b/klipper/main.cpp
index 58a07783..36539b63 100644
--- a/klipper/main.cpp
+++ b/klipper/main.cpp
@@ -34,8 +34,8 @@
 
 extern "C" int Q_DECL_EXPORT kdemain(int argc, char *argv[])
 {
-  KLocalizedString::setApplicationDomain("klipper");
   QApplication app(argc, argv);
+  KLocalizedString::setApplicationDomain("klipper");
 
   KAboutData aboutData(QStringLiteral("klipper"),
                        i18n("Klipper"),
diff --git a/krunner/main.cpp b/krunner/main.cpp
index b63156d2..24fe5a9f 100644
--- a/krunner/main.cpp
+++ b/krunner/main.cpp
@@ -43,10 +43,9 @@ int main(int argc, char **argv)
     qunsetenv("QT_DEVICE_PIXEL_RATIO");
     QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
 
-    KLocalizedString::setApplicationDomain("krunner");
-
     QQuickWindow::setDefaultAlphaBuffer(true);
     QApplication app(argc, argv);
+    KLocalizedString::setApplicationDomain("krunner");
 
     KQuickAddons::QtQuickSettings::init();
 
diff --git a/shell/main.cpp b/shell/main.cpp
index ed42ed40..22ef0388 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -56,9 +56,8 @@ int main(int argc, char *argv[])
 
     QQuickWindow::setDefaultAlphaBuffer(true);
 
-    KLocalizedString::setApplicationDomain("plasmashell");
-
     QApplication app(argc, argv);
+    KLocalizedString::setApplicationDomain("plasmashell");
 
     // The executable's path is added to the library/plugin paths.
     // This does not make much sense for plasmashell.
diff --git a/startkde/kcminit/main.cpp b/startkde/kcminit/main.cpp
index 6d6692b9..7181281c 100644
--- a/startkde/kcminit/main.cpp
+++ b/startkde/kcminit/main.cpp
@@ -221,9 +221,9 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char *argv[])
 
   startup = ( strcmp( argv[ 0 ], "kcminit_startup" ) == 0 ); // started from startkde?
 
-  KLocalizedString::setApplicationDomain("kcminit");
   QGuiApplication::setDesktopSettingsAware(false);
   QGuiApplication app(argc, argv); //gui is needed for several modules
+  KLocalizedString::setApplicationDomain("kcminit");
   KAboutData about(QStringLiteral("kcminit"), i18n("KCMInit"), QString(),
                    i18n("KCMInit - runs startup initialization for Control Modules."), KAboutLicense::GPL);
   KAboutData::setApplicationData(about);
diff --git a/systemmonitor/main.cpp b/systemmonitor/main.cpp
index 5e6be4f8..ccf6cae7 100644
--- a/systemmonitor/main.cpp
+++ b/systemmonitor/main.cpp
@@ -25,9 +25,8 @@
 
 int main(int argc, char** argv)
 {
-    KLocalizedString::setApplicationDomain("systemmonitor");
-
     QApplication app(argc, argv);
+    KLocalizedString::setApplicationDomain("systemmonitor");
 
     app.setOrganizationDomain(QStringLiteral("kde.org"));
     app.setDesktopFileName(QStringLiteral("org.kde.systemmonitor"));
-- 
2.16.2

Places

File 0001-Call-KLocalizedString-setApplicationDomain-after-Q-A.patch of Package plasma5-workspace

Places