diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-31 09:04:29 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-31 13:01:04 +0100 |
| commit | 5d27e14e4ca49263d9c3309b5e93d4cb386063cc (patch) | |
| tree | 714832e22d596c721744fd080148856a95f6d8f5 /src/quicktemplates2/qquickcombobox.cpp | |
| parent | ac6f4903aeb2e8399b5aa538b35a760f0392568c (diff) | |
| parent | c3858bd53974e486e03537d1937deb0020828556 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I697f98d5214f487c915032d744ec593da05368a8
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 f1e05b7e..b4d9bead 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -1647,9 +1647,9 @@ void QQuickComboBox::componentComplete() { Q_D(QQuickComboBox); d->executeIndicator(true); + QQuickControl::componentComplete(); if (d->popup) d->executePopup(true); - QQuickControl::componentComplete(); if (d->delegateModel && d->ownModel) static_cast<QQmlDelegateModel *>(d->delegateModel)->componentComplete(); |