From 713e5e291443a5a308932d9476a7d930d4b59bc4 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Thu, 12 Mar 2015 13:59:42 +0100 Subject: QComboBox: use native popup on iOS Enable native popup on iOS as well as OS X Change-Id: If99180a017768d9c94241adf2282ee9b3f69cbc1 Reviewed-by: Gabriel de Dietrich --- src/widgets/widgets/qcombobox_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/widgets/widgets/qcombobox_p.h') diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h index 88b360257f..580054780f 100644 --- a/src/widgets/widgets/qcombobox_p.h +++ b/src/widgets/widgets/qcombobox_p.h @@ -373,7 +373,7 @@ public: void updateViewContainerPaletteAndOpacity(); void updateFocusPolicy(); -#ifdef Q_OS_OSX +#ifdef Q_OS_MAC void cleanupNativePopup(); bool showNativePopup(); #endif @@ -403,7 +403,7 @@ public: QPersistentModelIndex root; Qt::CaseSensitivity autoCompletionCaseSensitivity; int indexBeforeChange; -#ifdef Q_OS_OSX +#ifdef Q_OS_MAC QPlatformMenu *m_platformMenu; #endif #ifndef QT_NO_COMPLETER -- cgit v1.2.3