diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4654b1d..f92b8a5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,67 +1,67 @@
 cmake_minimum_required(VERSION 3.0)
 set(PIM_VERSION "5.7.3")
 
 project(Akonadi-Contact VERSION ${PIM_VERSION})
 
 # ECM setup
 
 set(KF5_VERSION "5.39.0")
 
 find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
 include(GenerateExportHeader)
 include(ECMGenerateHeaders)
 include(ECMGeneratePriFile)
 include(CMakePackageConfigHelpers)
 include(ECMSetupVersion)
 include(FeatureSummary)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(ECMInstallIcons)
 include(ECMQtDeclareLoggingCategory)
 include(ECMCoverageOption)
 
 
 set(AKONADI_CONTACTS_VERSION ${PIM_VERSION})
 set(AKONADI_MIME_VERSION "5.7.3")
 set(KCONTACTS_VERSION "5.7.3")
 set(KMIMELIB_VERSION "5.7.3")
 set(AKONADI_VERSION "5.7.3")
 
 set(QT_REQUIRED_VERSION "5.8.0")
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test)
 ########### Find packages ###########
 find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Codecs ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5TextWidgets ${KF5_VERSION} CONFIG REQUIRED)
 
 find_package(KF5Contacts ${KCONTACTS_VERSION} CONFIG REQUIRED)
 find_package(KF5Mime ${KMIMELIB_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiMime ${AKONADI_MIME_VERSION} CONFIG REQUIRED)
 find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
 
 set(Prison_MIN_VERSION "${KF5_VERSION}")
 find_package(KF5Prison ${Prison_MIN_VERSION} CONFIG REQUIRED)
 
 ########### Targets ###########
 
 add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
 add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
-add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050a00)
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
 if(BUILD_TESTING)
    add_definitions(-DBUILD_TESTING)
 endif(BUILD_TESTING)
 
 
 add_subdirectory(src)
 add_subdirectory(kcm)
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/src/contact-editor/editor/generalinfoeditor/displaynameeditwidget.cpp b/src/contact-editor/editor/generalinfoeditor/displaynameeditwidget.cpp
index 67fb77ff..4cf86f6b 100644
--- a/src/contact-editor/editor/generalinfoeditor/displaynameeditwidget.cpp
+++ b/src/contact-editor/editor/generalinfoeditor/displaynameeditwidget.cpp
@@ -1,257 +1,257 @@
 /*
     This file is part of Contact Editor.
 
     Copyright (c) 2009 Tobias Koenig <tokoe@kde.org>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     This library is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
     License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
 
 #include "displaynameeditwidget.h"
 
 #include <QEvent>
 #include <QAbstractItemView>
 #include <QHBoxLayout>
 #include <QPainter>
 #include <QStyledItemDelegate>
 
 #include <kcontacts/addressee.h>
 #include <KComboBox>
 #include <KLocalizedString>
 
 // Tries to guess the display type that is used for the passed contact
 static DisplayNameEditWidget::DisplayType guessedDisplayType(const KContacts::Addressee &contact)
 {
     if (contact.formattedName() == (contact.givenName() + QLatin1Char(' ') + contact.familyName())) {
         return DisplayNameEditWidget::SimpleName;
     } else if (contact.formattedName() == contact.assembledName()) {
         return DisplayNameEditWidget::FullName;
     } else if (contact.formattedName() == (contact.familyName() + QStringLiteral(", ") + contact.givenName())) {
         return DisplayNameEditWidget::ReverseNameWithComma;
     } else if (contact.formattedName() == (contact.familyName() + QLatin1Char(' ') + contact.givenName())) {
         return DisplayNameEditWidget::ReverseName;
     } else if (contact.formattedName() == contact.organization()) {
         return DisplayNameEditWidget::Organization;
     } else {
         return DisplayNameEditWidget::CustomName;
     }
 }
 
 class DisplayNameDelegate : public QStyledItemDelegate
 {
     Q_OBJECT
 public:
     DisplayNameDelegate(QAbstractItemView *view, QObject *parent = nullptr)
         : QStyledItemDelegate(parent)
         , mMaxDescriptionWidth(0)
     {
         mDescriptions.append(i18n("Short Name"));
         mDescriptions.append(i18n("Full Name"));
         mDescriptions.append(i18n("Reverse Name with Comma"));
         mDescriptions.append(i18n("Reverse Name"));
         mDescriptions.append(i18n("Organization"));
         mDescriptions.append(i18nc("@item:inlistbox A custom name format", "Custom"));
 
         QFont font = view->font();
         font.setStyle(QFont::StyleItalic);
         QFontMetrics metrics(font);
         for (const QString &description : qAsConst(mDescriptions)) {
-            mMaxDescriptionWidth = qMax(mMaxDescriptionWidth, metrics.width(description));
+            mMaxDescriptionWidth = qMax(mMaxDescriptionWidth, metrics.boundingRect(description).width());
         }
 
-        mMaxDescriptionWidth += 3;
+        mMaxDescriptionWidth += 2;
     }
 
     int maximumDescriptionWidth() const
     {
         return mMaxDescriptionWidth;
     }
 
     void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override
     {
         QStyledItemDelegate::paint(painter, option, index);
         const QRect rect(option.rect.width() - mMaxDescriptionWidth, option.rect.y(), mMaxDescriptionWidth, option.rect.height());
         painter->save();
         QFont font(painter->font());
         font.setStyle(QFont::StyleItalic);
         painter->setFont(font);
         if (option.state & QStyle::State_Selected) {
             painter->setPen(option.palette.color(QPalette::Normal, QPalette::BrightText));
         } else {
             painter->setPen(option.palette.color(QPalette::Disabled, QPalette::Text));
         }
         painter->drawText(rect, Qt::AlignLeft, mDescriptions.at(index.row()));
         painter->restore();
     }
 
     QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override
     {
         QSize size = QStyledItemDelegate::sizeHint(option, index);
         size.setWidth(size.width() + mMaxDescriptionWidth);
 
         return size;
     }
 
 private:
     QStringList mDescriptions;
     int mMaxDescriptionWidth;
 };
 
 DisplayNameEditWidget::DisplayNameEditWidget(QWidget *parent)
     : QWidget(parent)
     , mDisplayType(FullName)
 {
     QHBoxLayout *layout = new QHBoxLayout(this);
     layout->setMargin(0);
 
     mView = new KComboBox(this);
     mView->addItems(QStringList() << QString() << QString() << QString()
                                   << QString() << QString() << QString());
 
     layout->addWidget(mView);
     setFocusProxy(mView);
     setFocusPolicy(Qt::StrongFocus);
     connect(mView, QOverload<int>::of(&KComboBox::activated), this, &DisplayNameEditWidget::displayTypeChanged);
 
     DisplayNameDelegate *delegate = new DisplayNameDelegate(mView->view());
     mView->view()->setItemDelegate(delegate);
 
     mAdditionalPopupWidth = delegate->maximumDescriptionWidth();
 
     mViewport = mView->view()->viewport();
     mViewport->installEventFilter(this);
 }
 
 DisplayNameEditWidget::~DisplayNameEditWidget()
 {
 }
 
 void DisplayNameEditWidget::setReadOnly(bool readOnly)
 {
     mView->setEnabled(!readOnly);
 }
 
 void DisplayNameEditWidget::setDisplayType(DisplayType type)
 {
     if ((int)type == -1) {
         // guess the used display type
         mDisplayType = guessedDisplayType(mContact);
     } else {
         mDisplayType = type;
     }
 
     updateView();
 }
 
 DisplayNameEditWidget::DisplayType DisplayNameEditWidget::displayType() const
 {
     return mDisplayType;
 }
 
 void DisplayNameEditWidget::loadContact(const KContacts::Addressee &contact)
 {
     mContact = contact;
 
     mDisplayType = guessedDisplayType(mContact);
 
     updateView();
 }
 
 void DisplayNameEditWidget::storeContact(KContacts::Addressee &contact) const
 {
     contact.setFormattedName(mView->currentText());
 }
 
 void DisplayNameEditWidget::changeName(const KContacts::Addressee &contact)
 {
     const QString organization = mContact.organization();
     mContact = contact;
     mContact.setOrganization(organization);
     if (mDisplayType == CustomName) {
         mContact.setFormattedName(mView->currentText());
     }
 
     updateView();
 }
 
 void DisplayNameEditWidget::changeOrganization(const QString &organization)
 {
     mContact.setOrganization(organization);
 
     updateView();
 }
 
 void DisplayNameEditWidget::displayTypeChanged(int type)
 {
     mDisplayType = (DisplayType)type;
 
     updateView();
 }
 
 bool DisplayNameEditWidget::eventFilter(QObject *object, QEvent *event)
 {
     if (object == mViewport) {
         if (event->type() == QEvent::Show) {
             // retrieve the widget that contains the popup view
             QWidget *parentWidget = mViewport->parentWidget()->parentWidget();
 
             int maxWidth = 0;
             QFontMetrics metrics(mView->font());
             const int viewCount(mView->count());
             for (int i = 0; i < viewCount; ++i) {
-                maxWidth = qMax(maxWidth, metrics.width(mView->itemText(i)));
+                maxWidth = qMax(maxWidth, metrics.boundingRect(mView->itemText(i)).width());
             }
 
             // resize it to show the complete content
             parentWidget->resize(maxWidth + mAdditionalPopupWidth + 20, parentWidget->height());
         }
         return false;
     }
 
     return QWidget::eventFilter(object, event);
 }
 
 void DisplayNameEditWidget::updateView()
 {
     // SimpleName:
     mView->setItemText(0, mContact.givenName() + QLatin1Char(' ') + mContact.familyName());
 
     // FullName:
     mView->setItemText(1, mContact.assembledName());
 
     // ReverseNameWithComma:
     mView->setItemText(2, mContact.familyName() + QStringLiteral(", ") + mContact.givenName());
 
     // ReverseName:
     mView->setItemText(3, mContact.familyName() + QLatin1Char(' ') + mContact.givenName());
 
     // Organization:
     mView->setItemText(4, mContact.organization());
 
     // CustomName:
     mView->setItemText(5, mContact.formattedName());
 
     // delay the state change here, since we might have been called from mView via a signal
     QMetaObject::invokeMethod(this, "setComboBoxEditable", Qt::QueuedConnection, Q_ARG(bool, mDisplayType == CustomName));
 
     mView->setCurrentIndex((int)mDisplayType);
 }
 
 void DisplayNameEditWidget::setComboBoxEditable(bool value)
 {
     mView->setEditable(value);
 }
 
 #include "displaynameeditwidget.moc"