Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: Ie24be82ee70bf103c2664de1a42741979262b10c

2 files changed, 10 insertions, 15 deletions

diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index a53c278aea..9a0e969e1c 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -2539,21 +2539,6 @@ QSize QComboBox::sizeHint() const
 }
 
 #ifdef Q_OS_MAC
-
-namespace {
-struct IndexSetter {
-    int index;
-    QComboBox *cb;
-
-    void operator()(void)
-    {
-        cb->setCurrentIndex(index);
-        emit cb->activated(index);
-        emit cb->activated(cb->itemText(index));
-    }
-};
-}
-
 void QComboBoxPrivate::cleanupNativePopup()
 {
     if (!m_platformMenu)
diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h
index eadb21628f..5967776a61 100644
--- a/src/widgets/widgets/qcombobox_p.h
+++ b/src/widgets/widgets/qcombobox_p.h
@@ -390,6 +390,16 @@ public:
 #ifdef Q_OS_MAC
     void cleanupNativePopup();
     bool showNativePopup();
+    struct IndexSetter {
+        int index;
+        QComboBox *cb;
+
+        void operator()(void)
+        {
+            cb->setCurrentIndex(index);
+            cb->d_func()->emitActivated(cb->d_func()->currentIndex);
+        }
+    };
 #endif
 
     QAbstractItemModel *model;