diff options
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/dialogs/qtquickcontrols2.conf | 2 | ||||
-rw-r--r-- | tests/manual/nativestyle/CustomCheckBoxes.qml | 4 | ||||
-rw-r--r-- | tests/manual/nativestyle/CustomComboBoxes.qml | 4 | ||||
-rw-r--r-- | tests/manual/nativestyle/CustomDials.qml | 4 | ||||
-rw-r--r-- | tests/manual/nativestyle/CustomProgressBars.qml | 2 | ||||
-rw-r--r-- | tests/manual/nativestyle/main.cpp | 6 | ||||
-rw-r--r-- | tests/manual/styles-cover-flow/styles-cover-flow.qml | 2 |
7 files changed, 11 insertions, 13 deletions
diff --git a/tests/manual/dialogs/qtquickcontrols2.conf b/tests/manual/dialogs/qtquickcontrols2.conf index 7ac31807..53f380bf 100644 --- a/tests/manual/dialogs/qtquickcontrols2.conf +++ b/tests/manual/dialogs/qtquickcontrols2.conf @@ -1,5 +1,5 @@ [Controls] -Style=Default +Style=Basic ;Style=Fusion ;Style=Imagine ;Style=Material diff --git a/tests/manual/nativestyle/CustomCheckBoxes.qml b/tests/manual/nativestyle/CustomCheckBoxes.qml index ce3a5543..00dc7378 100644 --- a/tests/manual/nativestyle/CustomCheckBoxes.qml +++ b/tests/manual/nativestyle/CustomCheckBoxes.qml @@ -76,7 +76,7 @@ ControlContainer { defaultColor: "#353637" scale: 0.5 color: "green" - source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png" + source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png" visible: customIndicator.checkState === Qt.Checked } @@ -119,7 +119,7 @@ ControlContainer { defaultColor: "#353637" scale: 0.5 color: "green" - source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png" + source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png" visible: allCustom.checkState === Qt.Checked } diff --git a/tests/manual/nativestyle/CustomComboBoxes.qml b/tests/manual/nativestyle/CustomComboBoxes.qml index bd793e28..a51cca94 100644 --- a/tests/manual/nativestyle/CustomComboBoxes.qml +++ b/tests/manual/nativestyle/CustomComboBoxes.qml @@ -61,7 +61,7 @@ ControlContainer { y: control.topPadding + (control.availableHeight - height) / 2 color: control.palette.dark defaultColor: "#353637" - source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/double-arrow.png" + source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/double-arrow.png" opacity: enabled ? 1 : 0.3 } } @@ -100,7 +100,7 @@ ControlContainer { y: control2.topPadding + (control2.availableHeight - height) / 2 color: control2.palette.dark defaultColor: "#353637" - source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/double-arrow.png" + source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/double-arrow.png" opacity: enabled ? 1 : 0.3 } } diff --git a/tests/manual/nativestyle/CustomDials.qml b/tests/manual/nativestyle/CustomDials.qml index cc16e96f..b0df77b6 100644 --- a/tests/manual/nativestyle/CustomDials.qml +++ b/tests/manual/nativestyle/CustomDials.qml @@ -36,7 +36,7 @@ import QtQuick import QtQuick.Controls -import QtQuick.Controls.Default.impl +import QtQuick.Controls.Basic.impl import QtQuick.Layouts ControlContainer { @@ -68,7 +68,7 @@ ControlContainer { width: 14 height: 10 color: "green" - source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/dial-indicator.png" + source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/dial-indicator.png" antialiasing: true opacity: dial1.enabled ? 1 : 0.3 transform: [ diff --git a/tests/manual/nativestyle/CustomProgressBars.qml b/tests/manual/nativestyle/CustomProgressBars.qml index b7617f92..6ace8f20 100644 --- a/tests/manual/nativestyle/CustomProgressBars.qml +++ b/tests/manual/nativestyle/CustomProgressBars.qml @@ -37,7 +37,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import QtQuick.Controls.Default.impl +import QtQuick.Controls.Basic.impl ControlContainer { id: container diff --git a/tests/manual/nativestyle/main.cpp b/tests/manual/nativestyle/main.cpp index 4925efa8..b064dd96 100644 --- a/tests/manual/nativestyle/main.cpp +++ b/tests/manual/nativestyle/main.cpp @@ -42,10 +42,8 @@ int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); - // Todo: rename the "default" style to e.g "simple" - // and use "default" as a phony style name instad - // to mean "get me the default style on the current - // platform". + // 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); diff --git a/tests/manual/styles-cover-flow/styles-cover-flow.qml b/tests/manual/styles-cover-flow/styles-cover-flow.qml index ec9630cd..0f400c0d 100644 --- a/tests/manual/styles-cover-flow/styles-cover-flow.qml +++ b/tests/manual/styles-cover-flow/styles-cover-flow.qml @@ -74,7 +74,7 @@ Window { anchors.leftMargin: 130 anchors.rightMargin: 130 model: ListModel { - ListElement { source: "qtquickcontrols2-default.png"; dark: false } + ListElement { source: "qtquickcontrols2-basic.png"; dark: false } ListElement { source: "qtquickcontrols2-fusion.png"; dark: false } ListElement { source: "qtquickcontrols2-universal-light.png"; dark: false } ListElement { source: "qtquickcontrols2-universal-dark.png"; dark: true } |