diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 03:02:48 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 03:02:48 +0100 |
| commit | 3d0d67ff7867baa4fdaa6f6ad91bbdd9c664468e (patch) | |
| tree | cf0406c9f17342f97643e582a15241e0d2393c2b /src/imports/controls/imagine | |
| parent | cbb9a1279619f291a90bf75a46219c3c2839d136 (diff) | |
| parent | 0425562e14e41b62dc7631c7c02768b8294454d0 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I53a6326a91c2de5a6016df7322df4a6159f2330e
Diffstat (limited to 'src/imports/controls/imagine')
| -rw-r--r-- | src/imports/controls/imagine/ComboBox.qml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/imports/controls/imagine/ComboBox.qml b/src/imports/controls/imagine/ComboBox.qml index 2d582e98..92937826 100644 --- a/src/imports/controls/imagine/ComboBox.qml +++ b/src/imports/controls/imagine/ComboBox.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.14 -import QtQuick.Window 2.14 -import QtQuick.Templates 2.14 as T -import QtQuick.Controls 2.14 -import QtQuick.Controls.Imagine 2.14 -import QtQuick.Controls.Imagine.impl 2.14 +import QtQuick 2.15 +import QtQuick.Window 2.15 +import QtQuick.Templates 2.15 as T +import QtQuick.Controls 2.15 +import QtQuick.Controls.Imagine 2.15 +import QtQuick.Controls.Imagine.impl 2.15 T.ComboBox { id: control @@ -98,6 +98,7 @@ T.ComboBox { readOnly: control.down inputMethodHints: control.inputMethodHints validator: control.validator + selectByMouse: control.selectTextByMouse font: control.font color: control.flat ? control.palette.windowText : control.editable ? control.palette.text : control.palette.buttonText |