History

Add Developer > Display Crash Options menu item

Is enabled by default. Disabling it stops the display of the crash handling options dialog at start-up.

David Rowe committed 11 years ago

Commit f6cf77a1 parent 9c782f66 files · +21 −11Browse files

Showing the changes to libraries/shared/src/SettingInterface.cpp (1 of 6 files). Show all

Unified · Split

libraries/shared/src/SettingInterface.cpp+7−4
@@ -35,9 +35,9 @@ namespace Setting { · 34 unmodified lines
3535 settingsManagerThread->quit();
3636 settingsManagerThread->wait();
3737 }
38−
39− // Sets up the settings private instance. Should only be run once at startup
40− void init() {
38+
39+ // Set up application settings. Should only be run once at startup.
40+ void preInit() {
4141 // read the ApplicationInfo.ini file for Name/Version/Domain information
4242 QSettings::setDefaultFormat(QSettings::IniFormat);
4343 QSettings applicationInfo(PathUtils::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat);
@@ -46,7 +46,10 @@ namespace Setting { · 2 unmodified lines
4646 QCoreApplication::setApplicationName(applicationInfo.value("name").toString());
4747 QCoreApplication::setOrganizationName(applicationInfo.value("organizationName").toString());
4848 QCoreApplication::setOrganizationDomain(applicationInfo.value("organizationDomain").toString());
49−
49+ }
50+
51+ // Sets up the settings private instance. Should only be run once at startup. preInit() must be run beforehand,
52+ void init() {
5053 // Let's set up the settings Private instance on its own thread
5154 QThread* thread = new QThread();
5255 Q_CHECK_PTR(thread);