From d72c511131534552fd4056636166831d08fb3236 Mon Sep 17 00:00:00 2001
From: dada513 <dada513@protonmail.com>
Date: Wed, 9 Feb 2022 10:57:16 +0100
Subject: Revert "Fix freedesktop icons" and fix icon on kwin

---
 launcher/Application.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'launcher')

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 7050e5dc..81a27495 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -187,7 +187,9 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
     setApplicationName(BuildConfig.LAUNCHER_NAME);
     setApplicationDisplayName(BuildConfig.LAUNCHER_DISPLAYNAME);
     setApplicationVersion(BuildConfig.printableVersionString());
-
+    #if (QT_VERSION >= QT_VERSION_CHECK(5,7,0))
+        setDesktopFileName(BuildConfig.LAUNCHER_DESKTOPNAME);
+    #endif
     startTime = QDateTime::currentDateTime();
 
 #ifdef Q_OS_LINUX
-- 
cgit 


From 619fcbfabf79fd63f410e53f1945590f8dc0fadf Mon Sep 17 00:00:00 2001
From: dada513 <dada513@protonmail.com>
Date: Thu, 10 Feb 2022 08:56:34 +0100
Subject: rename LAUNCHER_DESKTOPNAME to LAUNCHER_DESKTOPFILENAME

---
 buildconfig/BuildConfig.cpp.in | 2 +-
 buildconfig/BuildConfig.h      | 2 +-
 launcher/Application.cpp       | 2 +-
 program_info/CMakeLists.txt    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'launcher')

diff --git a/buildconfig/BuildConfig.cpp.in b/buildconfig/BuildConfig.cpp.in
index e7724c80..9faa40f3 100644
--- a/buildconfig/BuildConfig.cpp.in
+++ b/buildconfig/BuildConfig.cpp.in
@@ -12,7 +12,7 @@ Config::Config()
     LAUNCHER_DOMAIN = "@Launcher_Domain@";
     LAUNCHER_CONFIGFILE = "@Launcher_ConfigFile@";
     LAUNCHER_GIT = "@Launcher_Git@";
-    LAUNCHER_DESKTOPNAME = "@Launcher_DesktopName@";
+    LAUNCHER_DESKTOPFILENAME = "@Launcher_DesktopFileName@";
 
     USER_AGENT = "@Launcher_UserAgent@";
     USER_AGENT_UNCACHED = USER_AGENT + " (Uncached)";
diff --git a/buildconfig/BuildConfig.h b/buildconfig/BuildConfig.h
index c00d4df7..6bb533ed 100644
--- a/buildconfig/BuildConfig.h
+++ b/buildconfig/BuildConfig.h
@@ -14,7 +14,7 @@ public:
     QString LAUNCHER_DOMAIN;
     QString LAUNCHER_CONFIGFILE;
     QString LAUNCHER_GIT;
-    QString LAUNCHER_DESKTOPNAME;
+    QString LAUNCHER_DESKTOPFILENAME;
 
     /// The major version number.
     int VERSION_MAJOR;
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 81a27495..3a888739 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -188,7 +188,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
     setApplicationDisplayName(BuildConfig.LAUNCHER_DISPLAYNAME);
     setApplicationVersion(BuildConfig.printableVersionString());
     #if (QT_VERSION >= QT_VERSION_CHECK(5,7,0))
-        setDesktopFileName(BuildConfig.LAUNCHER_DESKTOPNAME);
+        setDesktopFileName(BuildConfig.LAUNCHER_DESKTOPFILENAME);
     #endif
     startTime = QDateTime::currentDateTime();
 
diff --git a/program_info/CMakeLists.txt b/program_info/CMakeLists.txt
index 1d2d19e9..f9d7621d 100644
--- a/program_info/CMakeLists.txt
+++ b/program_info/CMakeLists.txt
@@ -7,7 +7,7 @@ set(Launcher_DisplayName "${Launcher_CommonName}" PARENT_SCOPE)
 set(Launcher_UserAgent "${Launcher_CommonName}/${Launcher_RELEASE_VERSION_NAME}" PARENT_SCOPE)
 set(Launcher_ConfigFile "polymc.cfg" PARENT_SCOPE)
 set(Launcher_Git "https://github.com/PolyMC/PolyMC" PARENT_SCOPE)
-set(Launcher_DesktopName "org.polymc.PolyMC.desktop" PARENT_SCOPE)
+set(Launcher_DesktopFileName "org.polymc.PolyMC.desktop" PARENT_SCOPE)
 
 set(Launcher_Desktop "program_info/org.polymc.PolyMC.desktop" PARENT_SCOPE)
 set(Launcher_MetaInfo "program_info/org.polymc.PolyMC.metainfo.xml" PARENT_SCOPE)
-- 
cgit