diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,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) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) ########### CMake Config Files ########### diff --git a/src/ksieveui/editor/sievetextedit.cpp b/src/ksieveui/editor/sievetextedit.cpp --- a/src/ksieveui/editor/sievetextedit.cpp +++ b/src/ksieveui/editor/sievetextedit.cpp @@ -122,7 +122,7 @@ ++digits; } - const int space = 3 + fontMetrics().width(QLatin1Char('9')) * digits; + const int space = 2 + fontMetrics().boundingRect(QLatin1Char('9')).width() * digits; return space; } diff --git a/src/ksieveui/editor/webengine/findbar/findbarbase.cpp b/src/ksieveui/editor/webengine/findbar/findbarbase.cpp --- a/src/ksieveui/editor/webengine/findbar/findbarbase.cpp +++ b/src/ksieveui/editor/webengine/findbar/findbarbase.cpp @@ -98,7 +98,7 @@ mStatus->setTextFormat(Qt::PlainText); QFontMetrics fm(mStatus->font()); mNotFoundString = i18n("Phrase not found"); - mStatus->setFixedWidth(fm.width(mNotFoundString)); + mStatus->setFixedWidth(fm.boundingRect(mNotFoundString).width()); lay->addWidget(mStatus); setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed));