From 14f19b8f895579aff89a49a7b3151b5e61cd8f41 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 26 Oct 2022 22:37:18 +0300 Subject: [PATCH 33/33] Qt: Use QLibraryInfo::version() instead of qVersion() Latter caused compile failure with Qt-6.5 development version See osdn #45959 Signed-off-by: Marko Lindqvist --- client/gui-qt/gui_main.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/gui-qt/gui_main.cpp b/client/gui-qt/gui_main.cpp index 973f452844..d336718745 100644 --- a/client/gui-qt/gui_main.cpp +++ b/client/gui-qt/gui_main.cpp @@ -31,6 +31,7 @@ // Qt #include +#include #include #include #include @@ -576,8 +577,10 @@ void qtg_insert_client_build_info(char *outbuf, size_t outlen) { // There's also an separate entry about Qt in help menu. + QByteArray ver = QLibraryInfo::version().toString().toLocal8Bit(); + cat_snprintf(outbuf, outlen, _("\nBuilt against Qt %s, using %s"), - QT_VERSION_STR, qVersion()); + QT_VERSION_STR, ver.data()); #ifndef FC_QT5_MODE cat_snprintf(outbuf, outlen, _("\nBuilt in Qt6 mode.")); -- 2.35.1