diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-22 08:58:37 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-22 09:59:37 +0000 |
commit | f1eef22d0d1ddcc2ee48e45e522788eb97f429b0 (patch) | |
tree | 7f73763f338864a487c2d4980790f49975389e91 /src/quicktemplates2/qquickcombobox.cpp | |
parent | ab91c57135f7a86437a5a4341cd32df1d4682480 (diff) |
Revert "Popup: expose flip API"
This reverts commit 09706e8f9fc481d848a3616cace58baf5bc8b67c.
It was a bit rushed to expose the allow*Flip properties. We have now
added several other similar internal allowFooBar flags, so clearly
a more sustainable solution is to craft some kind of horizontal and
vertical sizing/positioning policies out of them. So, remove this
unreleased API while we still can, so we don't have to deprecate it
right away.
Conflicts:
src/imports/templates/qtquicktemplates2plugin.cpp
Change-Id: Iea33c11805071499b472b18426bbdc8d871a4a58
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
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 07d7d126..4ae78a01 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -688,7 +688,7 @@ void QQuickComboBox::setPopup(QQuickPopup *popup) d->deleteDelegate(d->popup); if (popup) { - popup->setAllowVerticalFlip(true); + QQuickPopupPrivate::get(popup)->allowVerticalFlip = true; popup->setClosePolicy(QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutsideParent); } d->popup = popup; |