Showing the changes to libraries/shared/src/SettingInterface.cpp (1 of 5 files). Show all
Unified · Split
| @@ -36,7 +36,7 @@ namespace Setting { · 35 unmodified lines | ||
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | // Sets up the settings private instance. Should only be run once at startup |
| 39 | − void setupPrivateInstance() { | |
| 39 | + void init() { | |
| 40 | 40 | // read the ApplicationInfo.ini file for Name/Version/Domain information |
| 41 | 41 | QSettings::setDefaultFormat(QSettings::IniFormat); |
| 42 | 42 | QSettings applicationInfo(PathUtils::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat); |
| @@ -59,14 +59,11 @@ namespace Setting { · 16 unmodified lines | ||
| 59 | 59 | QObject::connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater())); |
| 60 | 60 | privateInstance->moveToThread(thread); |
| 61 | 61 | thread->start(); |
| 62 | − qCDebug(shared) << "Settings thread started."; | |
| 63 | − | |
| 62 | + qCDebug(shared) << "Settings thread started."; | |
| 63 | + | |
| 64 | 64 | // Register cleanupPrivateInstance to run inside QCoreApplication's destructor. |
| 65 | 65 | qAddPostRoutine(cleanupPrivateInstance); |
| 66 | − } | |
| 67 | − // Register setupPrivateInstance to run after QCoreApplication's constructor. | |
| 68 | − Q_COREAPP_STARTUP_FUNCTION(setupPrivateInstance) | |
| 69 | − | |
| 66 | + } | |
| 70 | 67 | |
| 71 | 68 | Interface::~Interface() { |
| 72 | 69 | if (privateInstance) { |