diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-12-14 20:00:46 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-12-15 10:04:26 +0000 |
| commit | 6b89293b99e763589181fd1f75470712f52cee3c (patch) | |
| tree | 028706ec2c8e28da6187c37539f6607887cf51a0 /src/quicktemplates2/qquickcombobox.cpp | |
| parent | a03f18e026bb564237702cab477589b6916a0102 (diff) | |
Control: defer the execution of the content item
Tumbler is excluded because test_customContentItemAtConstruction()
starts failing if deferred execution is enabled for the content item.
Task-number: QTBUG-50992
Change-Id: I11022c3c380311396453cf6229e068e4aae2d82a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickcombobox.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickcombobox.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index 357800d6..d221b9bc 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -253,8 +253,6 @@ public: void handleRelease(const QPointF &point) override; void handleUngrab() override; - QQuickItem *getContentItem() override; - void executeIndicator(bool complete = false); void executePopup(bool complete = false); @@ -671,13 +669,6 @@ void QQuickComboBoxPrivate::handleUngrab() q->setPressed(false); } -QQuickItem *QQuickComboBoxPrivate::getContentItem() -{ - if (!contentItem) - executeContentItem(); - return contentItem; -} - static inline QString indicatorName() { return QStringLiteral("indicator"); } void QQuickComboBoxPrivate::executeIndicator(bool complete) @@ -1591,7 +1582,6 @@ void QQuickComboBox::componentComplete() { Q_D(QQuickComboBox); d->executeIndicator(true); - d->executeContentItem(true); if (d->popup) d->executePopup(true); QQuickControl::componentComplete(); |