merge bitcoin#24132: Bump minimum Qt version to 5.11.3

kwvg · Jun 11, 2023 · 5e6c6fc · 5e6c6fc
1 parent cbb7dd8
commit 5e6c6fc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1308,7 +1308,7 @@ else
     BITCOIN_QT_INIT
 
     dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
-    BITCOIN_QT_CONFIGURE([5.9.5])
+    BITCOIN_QT_CONFIGURE([5.11.3])
 
     dnl Keep a copy of the original $QT_INCLUDES and use it when invoking qt's moc
     QT_INCLUDES_UNSUPPRESSED=$QT_INCLUDES

diff --git a/doc/dependencies.md b/doc/dependencies.md
@@ -21,7 +21,7 @@ These are the dependencies currently used by Dash Core. You can find instruction
 | PCRE |  |  |  |  | [Yes](https://github.com/dashpay/dash/blob/develop/depends/packages/qt.mk) |
 | Python (tests) |  | [3.8](https://www.python.org/downloads) |  |  |  |
 | qrencode | [3.4.4](https://fukuchi.org/works/qrencode) |  | No |  |  |
-| Qt | [5.15.2](https://download.qt.io/official_releases/qt/) | [5.9.5](https://github.com/bitcoin/bitcoin/issues/20104) | No |  |  |
+| Qt | [5.15.2](https://download.qt.io/official_releases/qt/) | [5.11.3](https://github.com/bitcoin/bitcoin/pull/24132) | No |  |  |
 | SQLite | [3.32.1](https://sqlite.org/download.html) | [3.7.17](https://github.com/bitcoin/bitcoin/pull/19077) |  |  |  |
 | XCB |  |  |  |  | [Yes](https://github.com/dashpay/dash/blob/develop/depends/packages/qt.mk) (Linux only) |
 | xkbcommon |  |  |  |  | [Yes](https://github.com/dashpay/dash/blob/develop/depends/packages/qt.mk) (Linux only) |

diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -1878,11 +1878,7 @@ void PolishProgressDialog(QProgressDialog* dialog)
 
 int TextWidth(const QFontMetrics& fm, const QString& text)
 {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
     return fm.horizontalAdvance(text);
-#else
-    return fm.width(text);
-#endif
 }
 
 void LogQtInfo()