diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2020-09-01 17:49:42 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-09-24 13:48:49 +0200 |
| commit | 9219e86aa571d8b2f5da1ec92a461e5add38f57c (patch) | |
| tree | 6ec0cbb5c678507637c62ad48e26278afa90c861 /src/imports/controls/imagine | |
| parent | 74acbcc9f31aa2c64d076e1157979537d90d3f6d (diff) | |
Rename "Default" style to "Basic"
[ChangeLog][Styles] The Default style was renamed to Basic to account
for the introduction of the platform styles (macOS, Windows), which
will be used by default (where possible) when no style is specified.
Fixes: QTBUG-85984
Task-number: QTBUG-68814
Task-number: QTBUG-86403
Change-Id: I22b3199c8662e4ee5d55a1be1a51c9856ac62376
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/imports/controls/imagine')
| -rw-r--r-- | src/imports/controls/imagine/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/imports/controls/imagine/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/imports/controls/imagine/qmldir | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/controls/imagine/.prev_CMakeLists.txt b/src/imports/controls/imagine/.prev_CMakeLists.txt index b1e1a959..8d08bcca 100644 --- a/src/imports/controls/imagine/.prev_CMakeLists.txt +++ b/src/imports/controls/imagine/.prev_CMakeLists.txt @@ -9,7 +9,7 @@ qt_add_qml_module(qtquickcontrols2imaginestyleplugin VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2ImagineStylePlugin IMPORTS - QtQuick.Controls.Default/auto + QtQuick.Controls.Basic/auto GENERATE_QMLTYPES SOURCES qquickimaginestyle.cpp qquickimaginestyle_p.h diff --git a/src/imports/controls/imagine/CMakeLists.txt b/src/imports/controls/imagine/CMakeLists.txt index ce9b98cb..cb4726e9 100644 --- a/src/imports/controls/imagine/CMakeLists.txt +++ b/src/imports/controls/imagine/CMakeLists.txt @@ -9,7 +9,7 @@ qt_add_qml_module(qtquickcontrols2imaginestyleplugin VERSION "6.0" # special case CLASSNAME QtQuickControls2ImagineStylePlugin IMPORTS - QtQuick.Controls.Default/auto + QtQuick.Controls.Basic/auto GENERATE_QMLTYPES SOURCES qquickimaginestyle.cpp qquickimaginestyle_p.h diff --git a/src/imports/controls/imagine/qmldir b/src/imports/controls/imagine/qmldir index 65165bf4..e39f3d18 100644 --- a/src/imports/controls/imagine/qmldir +++ b/src/imports/controls/imagine/qmldir @@ -1,7 +1,7 @@ module QtQuick.Controls.Imagine plugin qtquickcontrols2imaginestyleplugin classname QtQuickControls2ImagineStylePlugin -import QtQuick.Controls.Default auto +import QtQuick.Controls.Basic auto # QtQuick.Controls 2.0 (originally introduced in Qt 5.7) ApplicationWindow 2.0 ApplicationWindow.qml |