aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickcombobox_p.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-04-28 12:37:58 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-04-28 11:56:14 +0000
commitc6e700d59a66ee648548a93fc7235e06423216cb (patch)
tree2a0f340598b022da121f86e3a96f84a3b6fedbf9 /src/quicktemplates2/qquickcombobox_p.h
parent23706b974f443b96bf1da86b264349e51d6d0d05 (diff)
ComboBox: separate indicator
This makes it possible to hide or replace either ComboBox background or content item without losing the built-in indicator. Change-Id: I308bbaa8190eba04ff3048a20c2d2ed0431a24f2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/quicktemplates2/qquickcombobox_p.h')
-rw-r--r--src/quicktemplates2/qquickcombobox_p.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickcombobox_p.h b/src/quicktemplates2/qquickcombobox_p.h
index ab0b7f10..8b25c616 100644
--- a/src/quicktemplates2/qquickcombobox_p.h
+++ b/src/quicktemplates2/qquickcombobox_p.h
@@ -69,6 +69,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickComboBox : public QQuickControl
Q_PROPERTY(QString displayText READ displayText WRITE setDisplayText RESET resetDisplayText NOTIFY displayTextChanged FINAL)
Q_PROPERTY(QString textRole READ textRole WRITE setTextRole NOTIFY textRoleChanged FINAL)
Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL)
+ Q_PROPERTY(QQuickItem *indicator READ indicator WRITE setIndicator NOTIFY indicatorChanged FINAL)
Q_PROPERTY(QQuickPopup *popup READ popup WRITE setPopup NOTIFY popupChanged FINAL)
public:
@@ -101,6 +102,9 @@ public:
QQmlComponent *delegate() const;
void setDelegate(QQmlComponent *delegate);
+ QQuickItem *indicator() const;
+ void setIndicator(QQuickItem *indicator);
+
QQuickPopup *popup() const;
void setPopup(QQuickPopup *popup);
@@ -122,6 +126,7 @@ Q_SIGNALS:
void displayTextChanged();
void textRoleChanged();
void delegateChanged();
+ void indicatorChanged();
void popupChanged();
void activated(int index);