From 97197f94b4098783e7dc444b0cc4028ab1b25a4f Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Wed, 30 Sep 2020 09:34:00 +0200 Subject: manual style, nativestyle: don't set style from main.cpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We now select the default style from the QQuickControls plugin, so the removed code snippet is no longer needed. Change-Id: I8117912d424ed7da87f81ce1f90f423a13545e54 Reviewed-by: Jan Arve Sæther --- tests/manual/nativestyle/main.cpp | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'tests') diff --git a/tests/manual/nativestyle/main.cpp b/tests/manual/nativestyle/main.cpp index b064dd96..cc487531 100644 --- a/tests/manual/nativestyle/main.cpp +++ b/tests/manual/nativestyle/main.cpp @@ -42,20 +42,6 @@ int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); - // TODO: when no style is specified, default to the appropriate native - // platform style if available, otherwise use Basic: QTBUG-86403 - const QString style = qEnvironmentVariable("DESKTOPGALLERY_STYLE"); - if (!style.isEmpty()) - QQuickStyle::setStyle(style); - else -#if defined(Q_OS_MACOS) - QQuickStyle::setStyle("macOS"); -#elif defined(Q_OS_WINDOWS) - QQuickStyle::setStyle("Windows"); -#else - QQuickStyle::setStyle("Fusion"); -#endif - QQmlApplicationEngine engine; const QUrl url(QStringLiteral("qrc:/main.qml")); QObject::connect(&engine, &QQmlApplicationEngine::objectCreated, -- cgit v1.2.3