From 23487ebaf3aa528135f78ab7e3f52353e133e6d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Fri, 5 Jun 2020 12:30:29 -0300 Subject: [PATCH] QGCComboBox: Use textActivated over deprecated activated(QString) in Qt 5.15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- src/QGCComboBox.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/QGCComboBox.cc b/src/QGCComboBox.cc index 990668d4c..3f26b3595 100644 --- a/src/QGCComboBox.cc +++ b/src/QGCComboBox.cc @@ -24,5 +24,9 @@ void QGCComboBox::simulateUserSetCurrentIndex(int index) // We have to manually signal activated emit activated(index); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) emit activated(itemText(index)); +#else + emit textActivated(itemText(index)); +#endif } -- 2.22.0