diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2021-02-25 11:30:06 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-25 13:40:03 +0000 |
| commit | b6a04a13a9f13d32cbd4beb4cab97d36bb2bbd07 (patch) | |
| tree | 724c851e43145c6bf30c628c564bdd489bf4ba41 | |
| parent | 2ecbb8ada45acf783b2485285bafbacb97240304 (diff) | |
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.
Change-Id: I986f4b169bb99836714f2f2ed99f17746686f946
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit a0d73125882a7a937d0d13348c8657ba81d50080)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | tests/manual/testbench/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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"); |