Merge commit '4ac8b5dc429b6c87b3bd9e743839c47f7a02c0ce' into junbo/gitflow_211123_o3de

2021-11-23 13:29:30 -08:00
parent ad922a312b 4ac8b5dc42
commit abb37c0b4a
2 changed files with 3 additions and 7 deletions
@@ -911,13 +911,9 @@ namespace
    QWidget* g_splashScreen = nullptr;
 }

-QString FormatVersion(const SFileVersion& v)
+QString FormatVersion([[maybe_unused]] const SFileVersion& v)
 {
-#if defined(LY_BUILD)
-    return QObject::tr("Version %1.%2.%3.%4 - Build %5").arg(v[3]).arg(v[2]).arg(v[1]).arg(v[0]).arg(LY_BUILD);
-#else
-    return QObject::tr("Version %1.%2.%3.%4").arg(v[3]).arg(v[2]).arg(v[1]).arg(v[0]);
-#endif
+    return QObject::tr("Version %1").arg(LY_VERSION_BUILD_NUMBER);
 }

 QString FormatRichTextCopyrightNotice()