Use QStringLiteral with DATADIR

Otherwise, some compilers might get confused.
tsujan · May 8, 2019 · 48e0ed8 · 48e0ed8
1 parent 2ddcb04
commit 48e0ed8
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/Kvantum/ChangeLog b/Kvantum/ChangeLog
@@ -15,6 +15,7 @@ V0.11.1
  * Added the missing disabled state of dials.
  * Since HDPI is supported by KDE's blur effect with Qt ≥ 5.12, disable Kvantum's workaround for those versions.
  * Explicitly set the minimum Qt version to 5.9.0.
+ * Use QStringLiteral with DATADIR (otherwise, some compilers might get confused).
 
 V0.11.0
 ---------

diff --git a/Kvantum/NEWS b/Kvantum/NEWS
@@ -1,5 +1,5 @@
 Latest version:
 
-	2 May 2019, V0.11.1
+	8 May 2019, V0.11.1
 
 See "ChangeLog" for changes.
diff --git a/Kvantum/kvantummanager/KvantumManager.cpp b/Kvantum/kvantummanager/KvantumManager.cpp
@@ -1795,7 +1795,7 @@ void KvantumManager::updateThemeList (bool updateAppThemes)
     if (hasDefaultThenme)
     {
         ui->comboBox->insertSeparator (1);
-        ui->comboBox->insertSeparator (1);
+        ui->comboBox->insertSeparator (1); // too short without combo menu
         if (updateAppThemes)
         {
             ui->appCombo->insertSeparator (1);

diff --git a/Kvantum/kvantummanager/main.cpp b/Kvantum/kvantummanager/main.cpp
@@ -114,7 +114,7 @@ int main (int argc, char *argv[])
     a.installTranslator (&qtTranslator);
 
     QTranslator KMTranslator;
-    KMTranslator.load ("kvantummanager_" + lang, DATADIR "/kvantummanager/translations");
+    KMTranslator.load ("kvantummanager_" + lang, QStringLiteral (DATADIR) + "/kvantummanager/translations");
     a.installTranslator (&KMTranslator);
 
     /* for Kvantum Manager to do its job, it should by styled by Kvantum */

diff --git a/Kvantum/kvantumpreview/main.cpp b/Kvantum/kvantumpreview/main.cpp
@@ -45,7 +45,7 @@ int main (int argc, char *argv[])
   viewer.installTranslator (&qtTranslator);
 
   QTranslator KPTranslator;
-  KPTranslator.load ("kvantumpreview_" + lang, DATADIR "/kvantumpreview/translations");
+  KPTranslator.load ("kvantumpreview_" + lang, QStringLiteral (DATADIR) + "/kvantumpreview/translations");
   viewer.installTranslator (&KPTranslator);
 
   KvantumPreview k (NULL);

diff --git a/Kvantum/style/CMakeLists.txt b/Kvantum/style/CMakeLists.txt
@@ -15,7 +15,7 @@ else()
   include(${QT_USE_FILE})
   add_definitions(${QT_DEFINITIONS})
 endif()
-find_package (X11)
+find_package(X11)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)