From f942ce16dc6ae1aaab3c5c67530a3a85586b9284 Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Thu, 2 Feb 2023 09:44:30 +0100 Subject: [PATCH] Remove dark mode workaround https://bugreports.qt.io/browse/QTBUG-72028?focusedCommentId=704716&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-704716 --- ScreenPlay/main.cpp | 10 +++------- ScreenPlay/qtquickcontrols2.conf | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ScreenPlay/main.cpp b/ScreenPlay/main.cpp index 6e364151..29472edd 100644 --- a/ScreenPlay/main.cpp +++ b/ScreenPlay/main.cpp @@ -1,9 +1,10 @@ // SPDX-License-Identifier: LicenseRef-EliasSteurerTachiom OR AGPL-3.0-only #include "ScreenPlay/app.h" -#include +#include #include #include +#include #if defined(Q_OS_WIN) #include @@ -22,12 +23,7 @@ int main(int argc, char* argv[]) qputenv("QT_MEDIA_BACKEND", "ffmpeg"); #endif -#if defined(Q_OS_WIN) - // https://bugreports.qt.io/browse/QTBUG-72028 - qputenv("QT_QPA_PLATFORM", "windows:darkmode=2"); -#endif - - QApplication qtGuiApp(argc, argv); + QGuiApplication qtGuiApp(argc, argv); ScreenPlay::App app; if (app.m_isAnotherScreenPlayInstanceRunning) { diff --git a/ScreenPlay/qtquickcontrols2.conf b/ScreenPlay/qtquickcontrols2.conf index 97b48040..8c73ce36 100644 --- a/ScreenPlay/qtquickcontrols2.conf +++ b/ScreenPlay/qtquickcontrols2.conf @@ -2,6 +2,6 @@ Style=Material [Material] -Theme=Light +Theme=System Accent=Orange Variant=Dense