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
35 settingsManagerThread->quit();35 settingsManagerThread->quit();
36 settingsManagerThread->wait();36 settingsManagerThread->wait();
37 }37 }
38 38
39 // Sets up the settings private instance. Should only be run once at startup39 // Set up application settings. Should only be run once at startup.
40 void init() {40 void preInit() {
41 // read the ApplicationInfo.ini file for Name/Version/Domain information41 // read the ApplicationInfo.ini file for Name/Version/Domain information
42 QSettings::setDefaultFormat(QSettings::IniFormat);42 QSettings::setDefaultFormat(QSettings::IniFormat);
43 QSettings applicationInfo(PathUtils::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat);43 QSettings applicationInfo(PathUtils::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat);
@@ -46,7 +46,10 @@ namespace Setting { · 2 unmodified lines
46 QCoreApplication::setApplicationName(applicationInfo.value("name").toString());46 QCoreApplication::setApplicationName(applicationInfo.value("name").toString());
47 QCoreApplication::setOrganizationName(applicationInfo.value("organizationName").toString());47 QCoreApplication::setOrganizationName(applicationInfo.value("organizationName").toString());
48 QCoreApplication::setOrganizationDomain(applicationInfo.value("organizationDomain").toString());48 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() {
50 // Let's set up the settings Private instance on its own thread53 // Let's set up the settings Private instance on its own thread
51 QThread* thread = new QThread();54 QThread* thread = new QThread();
52 Q_CHECK_PTR(thread);55 Q_CHECK_PTR(thread);