diff --git a/src/gui/application.cpp b/src/gui/application.cpp index 3f508659ba576..81eaaabdb9b6d 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -881,7 +881,8 @@ void Application::setupLogging() << "locale:" << QLocale::system().name() << "ui_lang:" << property("ui_lang") << "version:" << _theme->version() - << "os:" << Utility::platformName(); + << "os:" << Utility::platformName() + << "platform:" << QApplication::platformName(); qCInfo(lcApplication) << "Arguments:" << qApp->arguments(); } diff --git a/src/gui/infosettings.cpp b/src/gui/infosettings.cpp index 07b7fb306fdbf..89ac585fd52f9 100644 --- a/src/gui/infosettings.cpp +++ b/src/gui/infosettings.cpp @@ -27,7 +27,6 @@ #include #include #include -#include #include #include @@ -38,7 +37,6 @@ QString aboutTextForInfoPanel() { auto aboutText = Theme::instance()->about(); Theme::replaceLinkColorStringBackgroundAware(aboutText); - aboutText.replace(QRegularExpression(QStringLiteral(R"( \(([^()]*)\)$)")), QStringLiteral("
(\\1)")); return aboutText; } } diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp index 4d6642af35513..3f86e61f6d13c 100644 --- a/src/libsync/theme.cpp +++ b/src/libsync/theme.cpp @@ -459,13 +459,8 @@ Theme::Theme() QString Theme::developerStringInfo() const { - // Shorten Qt's OS name: "macOS Mojave (10.14)" -> "macOS" - const auto osStringList = Utility::platformName().split(QLatin1Char(' ')); - const auto osName = osStringList.at(0); - - const auto devString = QString(tr("%1 Desktop Client Version %2 (%3 running on %4)", "%1 is application name. %2 is the human version string. %3 is the operating system name. %4 is the platform name (wayland, x11, …)")) - .arg(APPLICATION_NAME, QString::fromLatin1(MIRALL_HUMAN_VERSION_STRING), osName, qGuiApp->platformName()); - + const auto devString = QString(tr("%1 Desktop Client Version %2", "%1 is application name. %2 is the human version string.")) + .arg(APPLICATION_NAME, QString::fromLatin1(MIRALL_HUMAN_VERSION_STRING)); return devString; }