Project

General

Profile

Feature #726 ยป 0030-Qt-Add-Qt6x-specific-mode-strings.patch

Marko Lindqvist, 06/18/2024 11:28 PM

View differences:

client/gui-qt/gui_main.cpp
cat_snprintf(outbuf, outlen, _("\nBuilt against Qt %s, using %s"),
QT_VERSION_STR, ver.data());
#ifndef FC_QT5_MODE
cat_snprintf(outbuf, outlen, _("\nBuilt in Qt6 mode."));
#else // FC_QT5_MODE
#ifdef FC_QT5_MODE
cat_snprintf(outbuf, outlen, _("\nBuilt in Qt5 mode."));
#elif defined(FC_QT6X_MODE)
cat_snprintf(outbuf, outlen, _("\nBuilt in Qt6x mode."));
#else // FC_QT5_MODE
cat_snprintf(outbuf, outlen, _("\nBuilt in Qt6 mode."));
#endif // FC_QT5_MODE
}
client/gui-qt/pages.cpp
#ifdef FC_QT5_MODE
fc_snprintf(msgbuf, sizeof(msgbuf), _("%s%s, Qt5 client"),
word_version(), VERSION_STRING);
#elif defined(FC_QT6X_MODE)
fc_snprintf(msgbuf, sizeof(msgbuf), _("%s%s, Qt6x client"),
word_version(), VERSION_STRING);
#else // FC_QT5_MODE
fc_snprintf(msgbuf, sizeof(msgbuf), _("%s%s, Qt6 client"),
word_version(), VERSION_STRING);
......
#ifdef FC_QT5_MODE
strncpy(msgbuf, _("Qt5 client"), sizeof(msgbuf) - 1);
#elif defined(FC_QT6X_MODE)
strncpy(msgbuf, _("Qt6x client"), sizeof(msgbuf) - 1);
#else // FC_QT5_MODE
strncpy(msgbuf, _("Qt6 client"), sizeof(msgbuf) - 1);
#endif // FC_QT5_MODE
tools/fcmp/mpgui_qt.cpp
rev_ver = fc_git_revision();
#ifndef FC_QT5_MODE
mode = R__("built in Qt6 mode.");
#else // FC_QT5_MODE
#ifdef FC_QT5_MODE
mode = R__("built in Qt5 mode.");
#elif defined(FC_QT6X_MODE)
mode = R__("built in Qt6x mode.");
#else // FC_QT5_MODE
mode = R__("built in Qt6 mode.");
#endif // FC_QT5_MODE
if (rev_ver == nullptr) {
tools/ruledit/ruledit_qt.cpp
rev_ver = fc_git_revision();
#ifndef FC_QT5_MODE
mode = R__("built in Qt6 mode.");
#else // FC_QT5_MODE
#ifdef FC_QT5_MODE
mode = R__("built in Qt5 mode.");
#elif defined(FC_QT6X_MODE)
mode = R__("built in Qt6x mode.");
#else // FC_QT5_MODE
mode = R__("built in Qt6 mode.");
#endif // FC_QT5_MODE
if (rev_ver == nullptr) {
    (1-1/1)