From 6b89293b99e763589181fd1f75470712f52cee3c Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 14 Dec 2017 20:00:46 +0100 Subject: 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 --- src/quicktemplates2/qquickcombobox.cpp | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/quicktemplates2/qquickcombobox.cpp') 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(); -- cgit v1.2.3