From d58c962bdb62d8d51407e8aa2d679695530b543c Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 26 Oct 2020 08:32:09 -0700 Subject: [PATCH] cleanup: replace deprecated signal Again, the replacement was only implemented in Qt 5.14, so more conditional code. Signed-off-by: Dirk Hohndel --- desktop-widgets/modeldelegates.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/desktop-widgets/modeldelegates.cpp b/desktop-widgets/modeldelegates.cpp index 0267cafcf..e2774240f 100644 --- a/desktop-widgets/modeldelegates.cpp +++ b/desktop-widgets/modeldelegates.cpp @@ -113,7 +113,11 @@ QWidget *ComboBoxDelegate::createEditor(QWidget *parent, const QStyleOptionViewI comboDelegate->view()->installEventFilter(const_cast(qobject_cast(this))); QAbstractItemView *comboPopup = comboDelegate->lineEdit()->completer()->popup(); comboPopup->setMouseTracking(true); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + connect(comboDelegate, &QComboBox::textHighlighted, this, &ComboBoxDelegate::testActivationString); +#else connect(comboDelegate, QOverload::of(&QComboBox::highlighted), this, &ComboBoxDelegate::testActivationString); +#endif connect(comboDelegate, QOverload::of(&QComboBox::activated), this, &ComboBoxDelegate::fakeActivation); connect(comboPopup, &QAbstractItemView::entered, this, &ComboBoxDelegate::testActivationIndex); connect(comboPopup, &QAbstractItemView::activated, this, &ComboBoxDelegate::fakeActivation);