Commit 533c6ec0 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

It compiles fine without deprecated method

parent 38d96b4e
Pipeline #45457 canceled with stage
...@@ -64,7 +64,7 @@ find_package(Grantlee5 ${GRANTLEE_LIB_VERSION} CONFIG REQUIRED) ...@@ -64,7 +64,7 @@ find_package(Grantlee5 ${GRANTLEE_LIB_VERSION} CONFIG REQUIRED)
########### Targets ########### ########### Targets ###########
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00)
add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054E00) add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054E00)
add_definitions(-DQT_NO_FOREACH) add_definitions(-DQT_NO_FOREACH)
......
...@@ -40,7 +40,7 @@ AddressLocationWidget::AddressLocationWidget(QWidget *parent) ...@@ -40,7 +40,7 @@ AddressLocationWidget::AddressLocationWidget(QWidget *parent)
mTypeCombo = new SelectAddressTypeComboBox(this); mTypeCombo = new SelectAddressTypeComboBox(this);
mTypeCombo->setObjectName(QStringLiteral("typeaddress")); mTypeCombo->setObjectName(QStringLiteral("typeaddress"));
connect(mTypeCombo, QOverload<const QString &>::of(&SelectAddressTypeComboBox::activated), this, &AddressLocationWidget::slotChanged); connect(mTypeCombo, &SelectAddressTypeComboBox::textHighlighted, this, &AddressLocationWidget::slotChanged);
gridLayout->addWidget(mTypeCombo, 0, 0, 1, 2); gridLayout->addWidget(mTypeCombo, 0, 0, 1, 2);
QLabel *label = new QLabel(KContacts::Address::streetLabel(), this); QLabel *label = new QLabel(KContacts::Address::streetLabel(), this);
...@@ -106,7 +106,7 @@ AddressLocationWidget::AddressLocationWidget(QWidget *parent) ...@@ -106,7 +106,7 @@ AddressLocationWidget::AddressLocationWidget(QWidget *parent)
mCountryCombo->setEditable(true); mCountryCombo->setEditable(true);
mCountryCombo->lineEdit()->setPlaceholderText(i18n("Add a Country")); mCountryCombo->lineEdit()->setPlaceholderText(i18n("Add a Country"));
mCountryCombo->setDuplicatesEnabled(false); mCountryCombo->setDuplicatesEnabled(false);
connect(mCountryCombo, QOverload<const QString &>::of(&KComboBox::activated), this, &AddressLocationWidget::slotChanged); connect(mCountryCombo, &KComboBox::textHighlighted, this, &AddressLocationWidget::slotChanged);
gridLayout->addWidget(mCountryCombo, 6, 1); gridLayout->addWidget(mCountryCombo, 6, 1);
mPreferredCheckBox = new QCheckBox(i18nc("street/postal", "This is the preferred address"), this); mPreferredCheckBox = new QCheckBox(i18nc("street/postal", "This is the preferred address"), this);
......
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