Skip to content

[stable-34.0] fix(logs): prints the Qt platform name at startup #10287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgallien merged 3 commits into from
Jul 2, 2026
Merged

[stable-34.0] fix(logs): prints the Qt platform name at startup #10287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e03593
fix(logs): prints the Qt platform name at startup
mgallien Jul 1, 2026
b21f332
fix: no special handling. we change the theme text
Rello Jul 2, 2026
c7417ba
fix: shorten version string; details in debug archive
Rello Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/gui/application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/*
* SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2014 ownCloud GmbH
Expand Down Expand Up @@ -881,7 +881,8 @@
<< "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();
}

Expand Down
2 changes: 0 additions & 2 deletions src/gui/infosettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <QLabel>
#include <QMessageBox>
#include <QPushButton>
#include <QRegularExpression>
#include <QSizePolicy>
#include <QUrl>

Expand All @@ -38,7 +37,6 @@ QString aboutTextForInfoPanel()
{
auto aboutText = Theme::instance()->about();
Theme::replaceLinkColorStringBackgroundAware(aboutText);
aboutText.replace(QRegularExpression(QStringLiteral(R"( \(([^()]*)\)$)")), QStringLiteral("<br>(\\1)"));
return aboutText;
}
}
Expand Down
9 changes: 2 additions & 7 deletions src/libsync/theme.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/*
* SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2012 ownCloud GmbH
Expand Down Expand Up @@ -459,13 +459,8 @@

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;
}

Expand Down
Loading