flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-04 00:16:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #921, use QVersionNumber

Browse Source 
* CVersion removed
* remaining utility functions moved to CBuildConfig
* patch version -> micro version (Qt naming)
* using classes adjusted
This commit is contained in:
Klaus Basan
2017-03-30 03:19:17 +02:00
committed by Mathew Sutcliffe
parent ec297d5838
commit f85501c7bf
9 changed files with 46 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackmisc/filelogger.cpp
View File

@@ -13,6 +13,7 @@
#include <QCoreApplication>
#include <QDateTime>
#include <QVersionNumber>
#include <QDir>
#include <QFileInfo>
#include <QFlags>
@@ -22,9 +23,10 @@
#include <QStringBuilder>
#include <QtGlobal>
using namespace BlackConfig;
namespace BlackMisc
{
CFileLogger::CFileLogger(QObject *parent) :
CFileLogger(QCoreApplication::applicationName(), QString(), parent)
{
@@ -117,12 +119,12 @@ namespace BlackMisc
void CFileLogger::writeHeaderToFile()
{
m_stream << "This is " << m_applicationName;
m_stream << " version " << BlackConfig::CVersion::version();
m_stream << " version " << CBuildConfig::getVersionString();
m_stream << " running on " << QSysInfo::prettyProductName();
m_stream << " " << QSysInfo::currentCpuArchitecture() << endl;
m_stream << "Built from revision " << BlackConfig::CBuildConfig::gitHeadSha1();
m_stream << " on " << BlackConfig::CBuildConfig::buildTimestamp().toString() << endl;
m_stream << "Built from revision " << CBuildConfig::gitHeadSha1();
m_stream << " on " << CBuildConfig::buildTimestamp().toString() << endl;
m_stream << "Built with Qt " << QT_VERSION_STR;
m_stream << " and running with Qt " << qVersion();

2
src/blackmisc/network/networkutils.cpp
View File

@@ -212,7 +212,7 @@ namespace BlackMisc
void CNetworkUtils::setSwiftUserAgent(QNetworkRequest &request)
{
static const QString userAgent("swift/" + CVersion::version());
static const QString userAgent("swift/" + CBuildConfig::getVersionString());
request.setRawHeader("User-Agent", userAgent.toLatin1());
}