Merge branch 'master' into 'master'

[GB.QT5] Workaround "Setting a QCompleter on non-editable QComboBox is not allowed" message

See merge request gambas/gambas!112
This commit is contained in:
Laurent Carlier 2019-10-14 04:48:20 +00:00
commit fe2deabfbd

View file

@ -754,7 +754,10 @@ MyComboBox::MyComboBox(QWidget *parent) :
QComboBox(parent) QComboBox(parent)
{ {
_sorted = _dirty = false; _sorted = _dirty = false;
#if QT5
#else
setCompleter(0); setCompleter(0);
#endif
setInsertPolicy(NoInsert); setInsertPolicy(NoInsert);
calcMinimumHeight(); calcMinimumHeight();
} }