Next deprecation fix backport

This commit is contained in:
Juergen Spitzmueller 2021-03-13 10:47:53 +01:00
parent 007a49a132
commit d53e74d11b

View File

@ -240,13 +240,31 @@ static QString buildinfo()
{ {
QString res; QString res;
QTextStream out(&res); QTextStream out(&res);
out << "LyX " << lyx_version out << "LyX "
<< " (" << lyx_release_date << ")" << endl; << lyx_version
<< " ("
<< lyx_release_date
<< ")"
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
<< Qt::endl;
#else
<< endl;
#endif
if (std::string(lyx_git_commit_hash) != "none") if (std::string(lyx_git_commit_hash) != "none")
out << qt_(" Git commit hash ") out << qt_(" Git commit hash ")
<< QString(lyx_git_commit_hash).left(8) << endl; << QString(lyx_git_commit_hash).left(8)
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
<< Qt::endl;
#else
<< endl;
#endif
out << lyx_version_info << endl; out << lyx_version_info
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
<< Qt::endl;
#else
<< endl;
#endif
return res; return res;
} }