Merge remote-tracking branch 'origin/master' into prerelease

jellyfin · Jan 16, 2022 · ddfbd94 · ddfbd94
2 parents a48c97e + 5985c40
commit ddfbd94
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -107,10 +107,15 @@ int main(int argc, char *argv[])
     scaleOption.setValueName("scale");
     scaleOption.setDefaultValue("auto");
 
+    auto platformOption = QCommandLineOption("platform", "Equivalant to QT_QPA_PLATFORM.");
+    platformOption.setValueName("platform");
+    platformOption.setDefaultValue("default");
+
     auto devOption = QCommandLineOption("remote-debugging-port", "Port number for devtools.");
     devOption.setValueName("port");
     parser.addOption(scaleOption);
     parser.addOption(devOption);
+    parser.addOption(platformOption);
 
     char **newArgv = appendCommandLineArguments(argc, argv, g_qtFlags);
     int newArgc = argc + g_qtFlags.size();
@@ -155,6 +160,12 @@ int main(int argc, char *argv[])
     else if (scale != "none")
       qputenv("QT_SCALE_FACTOR", scale.toUtf8());
 
+    auto platform = parser.value("platform");
+    if (!(platform.isEmpty() || platform == "default"))
+    {
+      qputenv("QT_QPA_PLATFORM", platform.toUtf8());
+    }
+
     QApplication app(newArgc, newArgv);
     app.setApplicationName("Jellyfin Media Player");