From b4f39f62263fc3509925b102b93685a776f5dd01 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 2 Aug 2018 00:57:26 +0200 Subject: [PATCH] Changed order of platform and version plus cast to int --- src/blackconfig/buildconfig.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/blackconfig/buildconfig.cpp b/src/blackconfig/buildconfig.cpp index 5fa696721..2e65da592 100644 --- a/src/blackconfig/buildconfig.cpp +++ b/src/blackconfig/buildconfig.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -228,7 +229,7 @@ namespace BlackConfig const QString &CBuildConfig::getVersionStringPlatform() { - static const QString s = getVersionString() + " " + getPlatformString(); + static const QString s = getPlatformString() % QStringLiteral(" ") % getVersionString(); return s; } @@ -262,7 +263,7 @@ namespace BlackConfig // max 2147483647 (2^31 - 1) // 1MMddHHmm (years since 2010) const long long yearOffset = 201000000000; - const int lctsInt = lctsll - yearOffset; + const int lctsInt = static_cast(lctsll - yearOffset); return lctsInt; } return 0; // intentionally 0 => 0.7.3.0 <- @@ -281,7 +282,7 @@ namespace BlackConfig // yyMMddHHmm (years since 2010) // yyyyMMddHHmm const long long yearOffset = 201000000000; - const int btsInt = btsll - yearOffset; + const int btsInt = static_cast(btsll - yearOffset); return btsInt; } return 0; // intentionally 0 => 0.7.3.0 <-