From a6a8a094c5b52e3317d0b5356ae0de5e95ba1772 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Tue, 18 Apr 2023 10:44:44 +0200 Subject: [PATCH] HelperWidgets: Explicitly import Basic style MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit HorizontalScrollBar and VerticalScrollBar customizes ScrollBar. The default Controls style used in Qt 6 depends on the platform the application runs on, and in case of Windows, it will use the native Windows style. The Windows style is not customizable. To avoid issues (like warnings about transitionDuration not being defined), explicitly opt into the Basic style, which can be customized. Fixes: QTBUG-107771 Change-Id: I141b3466964e5c3c64b39ca73a85eac14b9b6202 Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Fabian Kosmale Reviewed-by: Reviewed-by: Henning Gründl --- .../imports/HelperWidgets/HorizontalScrollBar.qml | 2 +- .../imports/HelperWidgets/VerticalScrollBar.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/HorizontalScrollBar.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/HorizontalScrollBar.qml index 7ce0324425f..3ae138d600b 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/HorizontalScrollBar.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/HorizontalScrollBar.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick.Controls.Basic 2.15 import StudioTheme 1.0 as StudioTheme ScrollBar { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/VerticalScrollBar.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/VerticalScrollBar.qml index ed19826e656..8cf54df8e54 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/VerticalScrollBar.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/VerticalScrollBar.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick.Controls.Basic 2.15 import StudioTheme 1.0 as StudioTheme ScrollBar {