diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-27 18:47:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-27 18:47:51 +0100 |
| commit | 64cbf20ec8ce9ae21e67bd0b1c30b16d12582bc7 (patch) | |
| tree | 624a5a247e3b9497ed15ab5985b8cbd89e46980a /src/imports/controls/universal | |
| parent | cf0905a25cc02a1ad2a242319e7ad9748c0a64f3 (diff) | |
| parent | 3de42498fce9bacbdda71e4c8a9af494434e2993 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
tests/auto/controls/data/tst_dialogbuttonbox.qml
Change-Id: I39ea99d988aaa7d1afd35d573cca44d009b859ce
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/DialogButtonBox.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/qmldir | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/universal.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/controls/universal/DialogButtonBox.qml b/src/imports/controls/universal/DialogButtonBox.qml index fc63f8f1..87e31f66 100644 --- a/src/imports/controls/universal/DialogButtonBox.qml +++ b/src/imports/controls/universal/DialogButtonBox.qml @@ -58,7 +58,7 @@ T.DialogButtonBox { } contentItem: ListView { - implicitWidth: contentWidth + implicitWidth: control.count === 1 ? 200 : contentWidth implicitHeight: 32 model: control.contentModel diff --git a/src/imports/controls/universal/qmldir b/src/imports/controls/universal/qmldir index 271eafa9..6555626f 100644 --- a/src/imports/controls/universal/qmldir +++ b/src/imports/controls/universal/qmldir @@ -1,4 +1,4 @@ module QtQuick.Controls.Universal plugin qtquickcontrols2universalstyleplugin classname QtQuickControls2UniversalStylePlugin -depends QtQuick.Controls 2.3 +depends QtQuick.Controls 2.4 diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro index 016fa085..c437328c 100644 --- a/src/imports/controls/universal/universal.pro +++ b/src/imports/controls/universal/universal.pro @@ -1,6 +1,6 @@ TARGET = qtquickcontrols2universalstyleplugin TARGETPATH = QtQuick/Controls.2/Universal -IMPORT_VERSION = 2.3 +IMPORT_VERSION = 2.4 QT += qml quick QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private |