make --opengl switch actually work (TM)

akdor1154 · Mar 16, 2015 · 917641d · 917641d
1 parent 296d276
commit 917641d
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 28 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -39,18 +39,22 @@
 
 int main(int argc, char * argv[])
 {
-    QApplication app(argc, argv);
-    app.setApplicationName("Qt WebEngine Kiosk");
+    QStringList qargv;
+    for (int i=0; i<argc; i++) {
+        qargv.append(QString(argv[i]));
+    }
+
+    //QApplication::setApplicationName("Qt WebEngine Kiosk");
 
     QCommandLineParser parser;
     parser.setApplicationDescription("A kiosk browser based on Qt's Chromium-derived WebEngine component");
     parser.addHelpOption();
     parser.addVersionOption();
 
     QStringList glModes;
-    QMetaEnum glMode = MainWindow::staticMetaObject.enumerator(MainWindow::staticMetaObject.indexOfEnumerator("GlMode"));
-    for (int value = 0; value < glMode.keyCount(); value++) {
-        glModes.append(QString(glMode.valueToKey(value)));
+    QMetaEnum glModeEnum = MainWindow::staticMetaObject.enumerator(MainWindow::staticMetaObject.indexOfEnumerator("GlMode"));
+    for (int value = 0; value < glModeEnum.keyCount(); value++) {
+        glModes.append(QString(glModeEnum.valueToKey(value)));
     }
 
     QList<QCommandLineOption> options = QList<QCommandLineOption>({
@@ -62,8 +66,33 @@ int main(int argc, char * argv[])
             });
 
     parser.addOptions(options);
-    parser.process(app);
 
+    parser.parse(qargv);
+    qDebug() << parser.errorText();
+    QString glMode;
+    if ((glMode = parser.value("opengl")).isEmpty())
+        glMode = "auto";
+    switch (glModeEnum.keyToValue(glMode.toUpper().toLatin1())) {
+    case MainWindow::NATIVE:
+        QCoreApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
+        qDebug() << "attempting to use native OpenGL";
+        break;
+    case MainWindow::ANGLE:
+        QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
+        qDebug() << "attempting to use OpenGL ES (or ANGLE, on Windows)";
+        break;
+    case MainWindow::SOFTWARE:
+        qDebug() << "using software rendering";
+        QCoreApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
+        break;
+    case MainWindow::AUTO:
+    default:
+        qDebug() << "using automatic gl";
+        break;
+    }
+
+    QApplication app(argc, argv);
+    parser.process(app);
 
 
     MainWindow *browser = new MainWindow();

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -177,29 +177,7 @@ void MainWindow::init(QCommandLineParser &options)
         manualScreen = ok ? monitorNum : 0;
     }
 
-    QMetaEnum glModeEnum = MainWindow::staticMetaObject.enumerator(MainWindow::staticMetaObject.indexOfEnumerator("GlMode"));
 
-    QString glMode;
-    if ((glMode = options.value("opengl")).isEmpty()) {
-        glMode = mainSettings->value("application/opengl_mode").toString();
-    }
-    switch (glModeEnum.keyToValue(glMode.toUpper().toLatin1())) {
-    case NATIVE:
-        qApp->setAttribute(Qt::AA_UseDesktopOpenGL);
-        qDebug() << "attempting to use native OpenGL";
-        break;
-    case ANGLE:
-        qApp->setAttribute(Qt::AA_UseOpenGLES);
-        qDebug() << "attempting to use OpenGL ES (or ANGLE, on Windows)";
-        break;
-    case SOFTWARE:
-        qDebug() << "using software rendering";
-        qApp->setAttribute(Qt::AA_UseSoftwareOpenGL);
-        break;
-    case AUTO:
-    default:
-        break;
-    }
 
     if (mainSettings->value("signals/enable").toBool()) {
         connect(handler, SIGNAL(sigUSR1()), SLOT(unixSignalUsr1()));