Display version number correctly in installer builds from branches that properly set the name on Jenkins. (#5856)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
This commit is contained in:
@@ -131,7 +131,7 @@ ly_add_source_properties(
|
||||
PROPERTY COMPILE_DEFINITIONS
|
||||
VALUES
|
||||
O3DE_COPYRIGHT_YEAR=${LY_VERSION_COPYRIGHT_YEAR}
|
||||
LY_BUILD=${LY_VERSION_BUILD_NUMBER}
|
||||
LY_VERSION_BUILD_NUMBER=${LY_VERSION_BUILD_NUMBER}
|
||||
${LY_PAL_TOOLS_DEFINES}
|
||||
)
|
||||
ly_add_source_properties(
|
||||
|
||||
@@ -913,13 +913,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()
|
||||
|
||||
Reference in New Issue
Block a user