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

Use ENABLE_QT_RESOURCES_OF_STATIC_DEPENDENCIES

This commit is contained in:
Martchus 2017-02-11 02:34:52 +01:00
parent afd39f21d3
commit 0e8dbd6f66
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/initiatequi.cpp
View File

@ -27,8 +27,6 @@ int runWidgetsGui(int argc, char *argv[], const QtConfigArguments &qtConfigArgs,
QSettings settings(QSettings::IniFormat, QSettings::UserScope, QApplication::organizationName(), QApplication::applicationName()); QSettings settings(QSettings::IniFormat, QSettings::UserScope, QApplication::organizationName(), QApplication::applicationName());
qtSettings.restore(settings); qtSettings.restore(settings);
qtSettings.apply(); qtSettings.apply();
// load resources needed by classes of qtutilities
QtUtilitiesResources::init();
// apply settings specified via command line args // apply settings specified via command line args
qtConfigArgs.applySettings(qtSettings.hasCustomFont()); qtConfigArgs.applySettings(qtSettings.hasCustomFont());
LOAD_QT_TRANSLATIONS; LOAD_QT_TRANSLATIONS;
@ -40,8 +38,6 @@ int runWidgetsGui(int argc, char *argv[], const QtConfigArguments &qtConfigArgs,
} }
// start event loop // start event loop
int res = a.exec(); int res = a.exec();
// cleanup resources
QtUtilitiesResources::cleanup();
// save Qt settings // save Qt settings
qtSettings.save(settings); qtSettings.save(settings);
return res; return res;

1
main.cpp
View File

@ -17,6 +17,7 @@
#if defined(GUI_QTWIDGETS) || defined(GUI_QTQUICK) #if defined(GUI_QTWIDGETS) || defined(GUI_QTQUICK)
# include <qtutilities/resources/qtconfigarguments.h> # include <qtutilities/resources/qtconfigarguments.h>
# include <QString> # include <QString>
ENABLE_QT_RESOURCES_OF_STATIC_DEPENDENCIES
#else #else
# include <c++utilities/application/fakeqtconfigarguments.h> # include <c++utilities/application/fakeqtconfigarguments.h>
#endif #endif

4
quickgui/initiatequick.cpp
View File

@ -41,8 +41,6 @@ int runQuickGui(int argc, char *argv[], const QtConfigArguments &qtConfigArgs)
#else #else
QGuiApplication a(argc, argv); QGuiApplication a(argc, argv);
#endif #endif
// load resources needed by classes of qtutilities
QtUtilitiesResources::init();
// apply settings specified via command line args // apply settings specified via command line args
qtConfigArgs.applySettings(); qtConfigArgs.applySettings();
LOAD_QT_TRANSLATIONS; LOAD_QT_TRANSLATIONS;
@ -55,8 +53,6 @@ int runQuickGui(int argc, char *argv[], const QtConfigArguments &qtConfigArgs)
QQmlApplicationEngine engine(QUrl("qrc:/qml/main.qml")); QQmlApplicationEngine engine(QUrl("qrc:/qml/main.qml"));
// start event loop // start event loop
int res = a.exec(); int res = a.exec();
// cleanup resources
QtUtilitiesResources::cleanup();
return res; return res;
} }