1 files changed, 6 insertions, 2 deletions
diff --git a/src/libs/installer/componentselectionpage_p.cpp b/src/libs/installer/componentselectionpage_p.cpp
index f60cf779a..048561f67 100644
--- a/src/libs/installer/componentselectionpage_p.cpp
+++ b/src/libs/installer/componentselectionpage_p.cpp
@@ -35,6 +35,7 @@
 #include "component.h"
 #include "fileutils.h"
 #include "messageboxhandler.h"
+#include "customcombobox.h"
 
 #include <QTreeView>
 #include <QLabel>
@@ -50,7 +51,6 @@
 #include <QStackedLayout>
 #include <QStackedWidget>
 #include <QLineEdit>
-#include <QComboBox>
 #include <QStandardItemModel>
 #include <QStyledItemDelegate>
 
@@ -136,9 +136,13 @@ ComponentSelectionPagePrivate::ComponentSelectionPagePrivate(ComponentSelectionP
     m_rightSideVLayout->addWidget(m_qbspPushButton, 0, Qt::AlignRight | Qt::AlignBottom);
 
     QHBoxLayout *topHLayout = new QHBoxLayout;
-    m_checkStateComboBox = new QComboBox(q);
+
+    // Using custom combobox to workaround QTBUG-90595
+    m_checkStateComboBox = new CustomComboBox(q);
+#ifdef Q_OS_MACOS
     QStyledItemDelegate *delegate = new QStyledItemDelegate(this);
     m_checkStateComboBox->setItemDelegate(delegate);
+#endif
     m_checkStateComboBox->setObjectName(QLatin1String("CheckStateComboBox"));
     topHLayout->addWidget(m_checkStateComboBox);