From 6ffa54088ac69c3cc58062dfa7f3de66b3b32e0e Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 8 Apr 2024 12:39:46 +0200
Subject: [PATCH] Ensure desktop file name is set when initializing GUIs

---
 gui/initiategui.cpp        |  3 ++-
 quickgui/initiatequick.cpp | 17 +++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/gui/initiategui.cpp b/gui/initiategui.cpp
index b838c7a..2bc691f 100644
--- a/gui/initiategui.cpp
+++ b/gui/initiategui.cpp
@@ -5,6 +5,8 @@
 #include "resources/config.h"
 #include "resources/qtconfig.h"
 
+#include <QApplication> // ensure QGuiApplication is defined before resources.h for desktop file name
+
 #include <qtutilities/resources/importplugin.h>
 #include <qtutilities/resources/qtconfigarguments.h>
 #include <qtutilities/resources/resources.h>
@@ -12,7 +14,6 @@
 
 #include <passwordfile/util/openssl.h>
 
-#include <QApplication>
 #include <QFile>
 #include <QMessageBox>
 #include <QSettings>
diff --git a/quickgui/initiatequick.cpp b/quickgui/initiatequick.cpp
index 117bca8..d0e634a 100644
--- a/quickgui/initiatequick.cpp
+++ b/quickgui/initiatequick.cpp
@@ -10,6 +10,15 @@
 // enable inline helper functions for Qt Quick provided by qtutilities
 #define QT_UTILITIES_GUI_QTQUICK
 
+// ensure QGuiApplication is defined before resources.h for desktop file name
+#ifdef PASSWORD_MANAGER_GUI_QTWIDGETS
+#include <QApplication>
+using App = QApplication;
+#else
+#include <QGuiApplication>
+using App = QGuiApplication;
+#endif
+
 #include <qtutilities/misc/desktoputils.h>
 #include <qtutilities/resources/qtconfigarguments.h>
 #include <qtutilities/resources/resources.h>
@@ -23,14 +32,6 @@
 #include <QQmlContext>
 #include <QSettings>
 
-#ifdef PASSWORD_MANAGER_GUI_QTWIDGETS
-#include <QApplication>
-using App = QApplication;
-#else
-#include <QGuiApplication>
-using App = QGuiApplication;
-#endif
-
 #include <cstdlib>
 
 using namespace CppUtilities;