From e34ccb69b8a3093cf010f34e6a1e2e9b07c861b8 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Mon, 16 May 2022 10:55:08 +0200 Subject: [PATCH] qt5/6 compat --- src/qtgui/main.cpp | 7 ++++++- src/qtgui/widgets/qxtconfirmationmessage.cpp | 7 +++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/qtgui/main.cpp b/src/qtgui/main.cpp index 0bd3c41a..216db41d 100644 --- a/src/qtgui/main.cpp +++ b/src/qtgui/main.cpp @@ -344,7 +344,12 @@ int main(int argc, char **argv) } QTranslator qt_trans(0); qt_trans.load(QString("qt_%1").arg(slang), - QLibraryInfo::path(QLibraryInfo::TranslationsPath)); +#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) + QLibraryInfo::path +#else + QLibraryInfo::location +#endif + (QLibraryInfo::TranslationsPath)); app.installTranslator(&qt_trans); // Translations for Recoll diff --git a/src/qtgui/widgets/qxtconfirmationmessage.cpp b/src/qtgui/widgets/qxtconfirmationmessage.cpp index cf384cd3..d501e0fb 100644 --- a/src/qtgui/widgets/qxtconfirmationmessage.cpp +++ b/src/qtgui/widgets/qxtconfirmationmessage.cpp @@ -80,10 +80,13 @@ QString QxtConfirmationMessagePrivate::key() const { QString value = overrideKey; if (value.isEmpty()) { - const QString all = qxt_p().windowTitle() + qxt_p().text() + - qxt_p().informativeText(); + const QString all = qxt_p().windowTitle() + qxt_p().text() + qxt_p().informativeText(); +#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) + value = QString::number(qChecksum(all.toLocal8Bit())); +#else const QByteArray data = all.toLocal8Bit(); value = QString::number(qChecksum(data.constData(), data.length())); +#endif } return value; }