From a0d73125882a7a937d0d13348c8657ba81d50080 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 25 Feb 2021 11:30:06 +0100 Subject: testbench: don't override style stored in settings with default style Now that we choose e.g. Fusion by default on Linux, QQuickStyle::name() will return that. If the user had a style previously selected and that was stored in settings, we should respect that. So, only prefer QQuickStyle::name() if we're not using the default style. Pick-to: 6.1 6.0 Change-Id: I986f4b169bb99836714f2f2ed99f17746686f946 Reviewed-by: Volker Hilsheimer --- tests/manual/testbench/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/manual/testbench/main.cpp b/tests/manual/testbench/main.cpp index 206d3965..ddad828f 100644 --- a/tests/manual/testbench/main.cpp +++ b/tests/manual/testbench/main.cpp @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) QSettings settings; QString style = QQuickStyle::name(); - if (!style.isEmpty()) + if (!style.isEmpty() && !QQuickStylePrivate::isUsingDefaultStyle()) settings.setValue("style", style); else QQuickStyle::setStyle(settings.value("style").isValid() ? settings.value("style").toString() : "Imagine"); -- cgit v1.2.3