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 // ensure QGuiApplication is defined before resources.h for desktop file name + #include #include #include @@ -12,7 +14,6 @@ #include -#include #include #include #include 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 +using App = QApplication; +#else +#include +using App = QGuiApplication; +#endif + #include #include #include @@ -23,14 +32,6 @@ #include #include -#ifdef PASSWORD_MANAGER_GUI_QTWIDGETS -#include -using App = QApplication; -#else -#include -using App = QGuiApplication; -#endif - #include using namespace CppUtilities;