Martchus
/
passwordmanager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure desktop file name is set when initializing GUIs

This commit is contained in:
Martchus 2024-04-08 12:39:46 +02:00
parent 1b6b645f7a
commit 6ffa54088a
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gui/initiategui.cpp
View File

@ -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>

17
quickgui/initiatequick.cpp
View File

@ -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;