From 22b3486f82fab7aff08dabafca582ce2e248e302 Mon Sep 17 00:00:00 2001
From: Tasuku Suzuki <tasuku.suzuki@qbc.io>
Date: Thu, 15 Aug 2019 03:17:51 +0900
Subject: [PATCH] Fix build without features.proxymodel

Change-Id: I9e51ed78d783da999187e7df58ddb83d76e3c7b7
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 src/widgets/widgets/qcombobox.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index 8b54d61e8e..68f19cc334 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -64,7 +64,9 @@
 #include <qheaderview.h>
 #include <qmath.h>
 #include <qmetaobject.h>
+#if QT_CONFIG(proxymodel)
 #include <qabstractproxymodel.h>
+#endif
 #include <qstylehints.h>
 #include <private/qguiapplication_p.h>
 #include <private/qhighdpiscaling_p.h>
@@ -200,6 +202,7 @@ QStyleOptionMenuItem QComboMenuDelegate::getStyleOption(const QStyleOptionViewIt
 void QComboBoxPrivate::_q_completerActivated(const QModelIndex &index)
 {
     Q_Q(QComboBox);
+#if QT_CONFIG(proxymodel)
     if (index.isValid() && q->completer()) {
         QAbstractProxyModel *proxy = qobject_cast<QAbstractProxyModel *>(q->completer()->completionModel());
         if (proxy) {
@@ -221,6 +224,7 @@ void QComboBoxPrivate::_q_completerActivated(const QModelIndex &index)
             emitActivated(currentIndex);
         }
     }
+#endif
 
 #  ifdef QT_KEYPAD_NAVIGATION
     if ( QApplicationPrivate::keypadNavigationEnabled()