diff --git a/Modules/about-distro/example/kcm-about-distrorc.ex b/Modules/about-distro/example/kcm-about-distrorc.ex --- a/Modules/about-distro/example/kcm-about-distrorc.ex +++ b/Modules/about-distro/example/kcm-about-distrorc.ex @@ -3,3 +3,4 @@ Website=http://www.kubuntu.org Version=1.2.3 Variant=Unstable Branches +UseOSReleaseVersion=true # controls if os-release's VERSION is used (default=false = use VERSION_ID) diff --git a/Modules/about-distro/src/Module.cpp b/Modules/about-distro/src/Module.cpp --- a/Modules/about-distro/src/Module.cpp +++ b/Modules/about-distro/src/Module.cpp @@ -161,7 +161,10 @@ // For example OS Ubuntu may be rebranded as Kubuntu. Also Kubuntu Active // as a product brand is different from Kubuntu. const QString distroName = cg.readEntry("Name", os.name); - const QString versionId = cg.readEntry("Version", os.versionId); + const QString osrVersion = cg.readEntry("UseOSReleaseVersion", false) + ? os.version + : os.versionId; + const QString versionId = cg.readEntry("Version", osrVersion); const QString distroNameVersion = QStringLiteral("%1 %2").arg(distroName, versionId); ui->nameVersionLabel->setText(distroNameVersion);