diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ 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) diff --git a/src/contact-editor/editor/generalinfoeditor/displaynameeditwidget.cpp b/src/contact-editor/editor/generalinfoeditor/displaynameeditwidget.cpp --- a/src/contact-editor/editor/generalinfoeditor/displaynameeditwidget.cpp +++ b/src/contact-editor/editor/generalinfoeditor/displaynameeditwidget.cpp @@ -68,10 +68,10 @@ 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 @@ -211,7 +211,7 @@ 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