tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qt5/6 compat

Browse Source
This commit is contained in:
Jean-Francois Dockes 2022-05-16 10:55:08 +02:00
parent 638450c8d4
commit e34ccb69b8
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/qtgui/main.cpp
View File

@ -344,7 +344,12 @@ int main(int argc, char **argv)
} }
QTranslator qt_trans(0); QTranslator qt_trans(0);
qt_trans.load(QString("qt_%1").arg(slang), 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); app.installTranslator(&qt_trans);
// Translations for Recoll // Translations for Recoll

7
src/qtgui/widgets/qxtconfirmationmessage.cpp
View File

@ -80,10 +80,13 @@ QString QxtConfirmationMessagePrivate::key() const
{ {
QString value = overrideKey; QString value = overrideKey;
if (value.isEmpty()) { if (value.isEmpty()) {
const QString all = qxt_p().windowTitle() + qxt_p().text() + const QString all = qxt_p().windowTitle() + qxt_p().text() + qxt_p().informativeText();
qxt_p().informativeText(); #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
value = QString::number(qChecksum(all.toLocal8Bit()));
#else
const QByteArray data = all.toLocal8Bit(); const QByteArray data = all.toLocal8Bit();
value = QString::number(qChecksum(data.constData(), data.length())); value = QString::number(qChecksum(data.constData(), data.length()));
#endif
} }
return value; return value;
} }