Ensure desktop file name is set when initializing GUIs
This commit is contained in:
parent
1b6b645f7a
commit
6ffa54088a
|
@ -5,6 +5,8 @@
|
||||||
#include "resources/config.h"
|
#include "resources/config.h"
|
||||||
#include "resources/qtconfig.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/importplugin.h>
|
||||||
#include <qtutilities/resources/qtconfigarguments.h>
|
#include <qtutilities/resources/qtconfigarguments.h>
|
||||||
#include <qtutilities/resources/resources.h>
|
#include <qtutilities/resources/resources.h>
|
||||||
|
@ -12,7 +14,6 @@
|
||||||
|
|
||||||
#include <passwordfile/util/openssl.h>
|
#include <passwordfile/util/openssl.h>
|
||||||
|
|
||||||
#include <QApplication>
|
|
||||||
#include <QFile>
|
#include <QFile>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QSettings>
|
#include <QSettings>
|
||||||
|
|
|
@ -10,6 +10,15 @@
|
||||||
// enable inline helper functions for Qt Quick provided by qtutilities
|
// enable inline helper functions for Qt Quick provided by qtutilities
|
||||||
#define QT_UTILITIES_GUI_QTQUICK
|
#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/misc/desktoputils.h>
|
||||||
#include <qtutilities/resources/qtconfigarguments.h>
|
#include <qtutilities/resources/qtconfigarguments.h>
|
||||||
#include <qtutilities/resources/resources.h>
|
#include <qtutilities/resources/resources.h>
|
||||||
|
@ -23,14 +32,6 @@
|
||||||
#include <QQmlContext>
|
#include <QQmlContext>
|
||||||
#include <QSettings>
|
#include <QSettings>
|
||||||
|
|
||||||
#ifdef PASSWORD_MANAGER_GUI_QTWIDGETS
|
|
||||||
#include <QApplication>
|
|
||||||
using App = QApplication;
|
|
||||||
#else
|
|
||||||
#include <QGuiApplication>
|
|
||||||
using App = QGuiApplication;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
|
|
||||||
using namespace CppUtilities;
|
using namespace CppUtilities;
|
||||||
|
|
Loading…
Reference in New Issue