chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move graphic engine configuration before creation of QApplication.

Browse Source 
Qt was emitting console warnings about attempts to change
Qt::AA_UseDesktopOpenGL after creating the QApplication.
This commit is contained in:
sawinglogz 2020-02-17 10:59:26 -05:00
parent bba5f93795
commit e698879e17
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
oscar/main.cpp
View File

@ -264,16 +264,37 @@ int main(int argc, char *argv[]) {
QSettings settings; QSettings settings;
QApplication a(argc, argv);
QStringList args = a.arguments();
// If shift key was held down when OSCAR was launched, force Software graphics Engine (aka LegacyGFX) // If shift key was held down when OSCAR was launched, force Software graphics Engine (aka LegacyGFX)
Qt::KeyboardModifiers keymodifier = QApplication::queryKeyboardModifiers(); Qt::KeyboardModifiers keymodifier = QApplication::keyboardModifiers();
QString forcedEngine = ""; QString forcedEngine = "";
if (keymodifier == Qt::ShiftModifier){ if (keymodifier == Qt::ShiftModifier){
settings.setValue(GFXEngineSetting, (unsigned int)GFX_Software); settings.setValue(GFXEngineSetting, (unsigned int)GFX_Software);
forcedEngine = "Software Engine forced by shift key at launch"; forcedEngine = "Software Engine forced by shift key at launch";
} }
// This argument needs to be processed before creating the QApplication,
// based on sample code at https://doc.qt.io/qt-5/qapplication.html#details
for (int i = 1; i < argc; ++i) {
if (!qstrcmp(argv[i], "--legacy")) {
settings.setValue(GFXEngineSetting, (unsigned int)GFX_Software);
forcedEngine = "Software Engine forced by --legacy command line switch";
}
}
GFXEngine gfxEngine = (GFXEngine)qMin((unsigned int)settings.value(GFXEngineSetting, (unsigned int)GFX_OpenGL).toUInt(), (unsigned int)MaxGFXEngine);
switch (gfxEngine) {
case 0: // GFX_OpenGL
QCoreApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
break;
case 1: // GFX_ANGLE
QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
break;
case 2: // GFX_Software
default:
QCoreApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
}
QApplication a(argc, argv);
QStringList args = a.arguments();
QString lastlanguage = settings.value(LangSetting, "").toString(); QString lastlanguage = settings.value(LangSetting, "").toString();
if (lastlanguage.compare("is", Qt::CaseInsensitive)) // Convert code for Hebrew from 'is' to 'he' if (lastlanguage.compare("is", Qt::CaseInsensitive)) // Convert code for Hebrew from 'is' to 'he'
@ -296,10 +317,7 @@ int main(int argc, char *argv[]) {
changing_language = true; // reset to force language dialog changing_language = true; // reset to force language dialog
settings.setValue(LangSetting,""); settings.setValue(LangSetting,"");
} }
else if (args[i] == "--legacy") { // "--legacy" is handle above, as it needs to be processed before creating QApplication.
settings.setValue(GFXEngineSetting, (unsigned int)GFX_Software);
forcedEngine = "Software Engine forced by --legacy command line switch";
}
else if (args[i] == "-p") else if (args[i] == "-p")
QThread::msleep(1000); QThread::msleep(1000);
else if (args[i] == "--profile") { else if (args[i] == "--profile") {
@ -324,22 +342,13 @@ int main(int argc, char *argv[]) {
} }
} // end of for args loop } // end of for args loop
GFXEngine gfxEngine = (GFXEngine)qMin((unsigned int)settings.value(GFXEngineSetting, (unsigned int)GFX_OpenGL).toUInt(), (unsigned int)MaxGFXEngine);
switch (gfxEngine) {
case 0:
QCoreApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
break;
case 1:
QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
break;
case 2:
default:
QCoreApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
}
initializeLogger(); initializeLogger();
// After initializing the logger, any qDebug() messages will be queued but not written to console
// until MainWindow is constructed below. In spite of that, we initialize the logger here so that
// the intervening messages to show up in the debug pane.
//
// The only time this is really noticeable is when initTranslations() presents its language
// selection QDialog, which waits indefinitely for user input before MainWindow is constructed.
qDebug().noquote() << "OSCAR starting" << QDateTime::currentDateTime().toString(); qDebug().noquote() << "OSCAR starting" << QDateTime::currentDateTime().toString();