Commit fa9c136e authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/release/20.04'

parents 711cef7d ef029c05
......@@ -25,7 +25,7 @@ include(ECMQtDeclareLoggingCategory)
set(KIDENTITYMANAGEMENT_LIB_VERSION ${PIM_VERSION})
set(PIMTEXTEDIT_LIB_VERSION "5.13.80")
set(PIMTEXTEDIT_LIB_VERSION "5.13.90")
ecm_setup_version(PROJECT VARIABLE_PREFIX KIDENTITYMANAGEMENT
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kidentitymanagement_version.h"
......
......@@ -141,11 +141,7 @@ void SignatureConfigurator::Private::init()
QStackedWidget *widgetStack = new QStackedWidget(q);
widgetStack->setEnabled(false); // since !mEnableCheck->isChecked()
vlay->addWidget(widgetStack, 1);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
q->connect(mSourceCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), widgetStack, &QStackedWidget::setCurrentIndex);
#else
q->connect(mSourceCombo, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), widgetStack, &QStackedWidget::setCurrentIndex);
#endif
q->connect(mSourceCombo, QOverload<int>::of(&QComboBox::highlighted), widgetStack, &QStackedWidget::setCurrentIndex);
// connects for the enabling of the widgets depending on
// signatureEnabled:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment