diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-15 16:14:22 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-15 16:14:22 +0200 |
| commit | b58ec3b086518da5aa573f99426235854c23e35f (patch) | |
| tree | 861a9935d8f1cdba2fdca546836a351736dbddbf /src/quickcontrols/doc | |
| parent | 4826f86e274f1b29bd769e6790824f9e62a40f62 (diff) | |
| parent | 22032227d16c39211e2ebceef97d21f4d89c7c87 (diff) | |
Merge tag 'v6.5.8-lts-lgpl' into 6.56.5
Qt 6.5.8-lts-lgpl release
Diffstat (limited to 'src/quickcontrols/doc')
3 files changed, 4 insertions, 4 deletions
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-custom.qml index 960600eec8..d4d5d04f5a 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-custom.qml @@ -69,7 +69,7 @@ ComboBox { popup: Popup { y: control.height - 1 width: control.width - implicitHeight: contentItem.implicitHeight + height: Math.min(contentItem.implicitHeight, control.Window.height - topMargin - bottomMargin) padding: 1 contentItem: ListView { diff --git a/src/quickcontrols/doc/src/includes/customize-button-background.qdocinc b/src/quickcontrols/doc/src/includes/customize-button-background.qdocinc index 0acad02d38..e8c88058b6 100644 --- a/src/quickcontrols/doc/src/includes/customize-button-background.qdocinc +++ b/src/quickcontrols/doc/src/includes/customize-button-background.qdocinc @@ -1,7 +1,7 @@ //! [file] \qml import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic ApplicationWindow { width: 400 diff --git a/src/quickcontrols/doc/src/qtquickcontrols-customize.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-customize.qdoc index 59a97baa0e..3a06d670bf 100644 --- a/src/quickcontrols/doc/src/qtquickcontrols-customize.qdoc +++ b/src/quickcontrols/doc/src/qtquickcontrols-customize.qdoc @@ -52,7 +52,7 @@ your application, refer to it by its filename: \qml - import QtQuick.Controls + import QtQuick.Controls.Basic ApplicationWindow { MyButton { @@ -68,7 +68,7 @@ control, first import the folder into a namespace: \qml - import QtQuick.Controls + import QtQuick.Controls.Basic import "controls" as MyControls ApplicationWindow { |