Commit 298c241 1 parent 3f5d20d commit 298c241 Copy full SHA for 298c241
File tree 3 files changed +15
-4
lines changed
3 files changed +15
-4
lines changed Original file line number Diff line number Diff line change
1
+ Bugfix: Fix the display of the version string for released builds
2
+
3
+ We removed a trailing `-` in the version string of released clients.
4
+
5
+ https://github.com/owncloud/client/pull/10329
Original file line number Diff line number Diff line change @@ -39,3 +39,12 @@ QString OCC::Version::suffix()
39
39
{
40
40
return QStringLiteral("@MIRALL_VERSION_SUFFIX@");
41
41
}
42
+
43
+ QString OCC::Version::displayString()
44
+ {
45
+ constexpr bool hasSuffix = !std::string_view("@MIRALL_VERSION_SUFFIX@").empty();
46
+ if (hasSuffix) {
47
+ return QStringLiteral("%1-%2").arg(versionWithBuildNumber().toString(), suffix());
48
+ }
49
+ return versionWithBuildNumber().toString();
50
+ }
Original file line number Diff line number Diff line change @@ -43,8 +43,5 @@ OCSYNC_EXPORT QString suffix();
43
43
*/
44
44
OCSYNC_EXPORT QString gitSha ();
45
45
46
- inline auto displayString ()
47
- {
48
- return QStringLiteral (" %1-%2" ).arg (versionWithBuildNumber ().toString (), suffix ());
49
- }
46
+ OCSYNC_EXPORT QString displayString ();
50
47
}
You can’t perform that action at this time.
0 commit comments