diff options
author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-04-12 16:19:58 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-04-15 14:45:47 +0000 |
commit | eae24fccc57437170e2ba01b894fa24fe65292be (patch) | |
tree | dfbd1450c237df8c2cd08838d2f054ef029ceea8 /src/quicktemplates2/qquickcombobox.cpp | |
parent | 0fe0283308199a6bf4a155627cddd524638c7063 (diff) |
Add QQuickAbstractButton::down
This property will determine whether or not the button is visually
pressed. Having such a distinction allows users more control over their
controls.
The patch also fixes the problem with ComboBox where pressing on the
ComboBox when it's open would cause a delegate in the popup to show as
being pressed.
Unless explicitly set, this property follows the value of the pressed
property. To return to the default value, set it to undefined.
Change-Id: I29ecf325ed2ede125613f0c878b0427937599866
Task-number: QTBUG-51005
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/quicktemplates2/qquickcombobox.cpp')
-rw-r--r-- | src/quicktemplates2/qquickcombobox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index e10a8b48..ec75c053 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -112,6 +112,7 @@ QT_BEGIN_NAMESPACE */ /*! + \readonly \qmlsignal void Qt.labs.controls::ComboBox::highlighted(int index) This signal is emitted when the item at \a index in the popup list is highlighted by the user. @@ -450,7 +451,6 @@ void QQuickComboBox::setPressed(bool pressed) } /*! - \readonly \qmlproperty int Qt.labs.controls::ComboBox::highlightedIndex This property holds the index of the highlighted item in the combo box popup list. |