diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc index 7365a9e3cba3493e769e74f45a43c943e0315245..b29e000b8ff8ae59fef7347643b856ea65cb0062 100644 --- a/src/branding/default/branding.desc +++ b/src/branding/default/branding.desc @@ -109,7 +109,7 @@ navigation: widget # # These strings support substitution from /etc/os-release # if KDE Frameworks 5.58 are available at build-time. When -# enabled, @{var-name} is replaced by the equivalent value +# enabled, ${varname} is replaced by the equivalent value # from os-release. All the supported var-names are in all-caps, # and are listed on the FreeDesktop.org site, # https://www.freedesktop.org/software/systemd/man/os-release.html @@ -121,7 +121,7 @@ navigation: widget # are visible as buttons there if the corresponding *show* keys # are set to "true" (they can also be overridden). strings: - productName: "@{NAME}" + productName: "${NAME}" shortProductName: Generic version: 2020.2 LTS shortVersion: 2020.2 diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 66753cc957e45f3b0a4a6124d0daeff42c0efff6..8549183fe4f00c7d9434ce111b688f65f56ca589 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -259,7 +259,7 @@ Branding::Branding( const QString& brandingFilePath, QObject* parent ) { QStringLiteral( "VARIANT_ID" ), relInfo.variantId() }, { QStringLiteral( "LOGO" ), relInfo.logo() } } }; auto expand = [ & ]( const QString& s ) -> QString - { return KMacroExpander::expandMacros( s, relMap, QLatin1Char( '@' ) ); }; + { return KMacroExpander::expandMacros( s, relMap, QLatin1Char( '$' ) ); }; #else auto expand = []( const QString& s ) -> QString { return s; }; #endif