From 17ce1eef348daa7d291f250bd6b249881ae73e7f Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 5 Apr 2016 00:12:41 +0200 Subject: [PATCH] refs #625, refs #614 integration of client id fix --- src/blackcore/application.cpp | 2 +- src/blackmisc/blackmisc.pro | 3 ++- src/blackmisc/buildconfig.h.in | 8 +++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index 92e67c8fb..fb5870b2a 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -62,7 +62,7 @@ namespace BlackCore { if (withMetadata) { CApplication::registerMetadata(); } QCoreApplication::setApplicationName(this->m_applicationName); - QCoreApplication::setApplicationVersion(CProject::version()); + QCoreApplication::setApplicationVersion(CVersion::version()); this->setObjectName(this->m_applicationName); this->initParser(); this->initLogging(); diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro index c127ae7d6..2b9a526c4 100644 --- a/src/blackmisc/blackmisc.pro +++ b/src/blackmisc/blackmisc.pro @@ -31,6 +31,7 @@ TRANSLATIONS += translations/blackmisc_i18n_de.ts \ translations/blackmisc_i18n_en.ts HEADERS += *.h \ + buildconfig.h.in \ $$PWD/pq/*.h \ $$PWD/aviation/*.h \ $$PWD/math/*.h \ @@ -69,7 +70,7 @@ win32 { DESTDIR = $$DestRoot/lib DLLDESTDIR = $$DestRoot/bin -OTHER_FILES += $$TRANSLATIONS readme.txt buildconfig.h.in +OTHER_FILES += $$TRANSLATIONS readme.txt win32 { dlltarget.path = $$PREFIX/bin diff --git a/src/blackmisc/buildconfig.h.in b/src/blackmisc/buildconfig.h.in index 5f298c2b8..9d397fe1a 100644 --- a/src/blackmisc/buildconfig.h.in +++ b/src/blackmisc/buildconfig.h.in @@ -31,7 +31,7 @@ $$DEFINE_SWIFT_SHIPPED#define SWIFT_SHIPPED namespace BlackMisc { - + //! Build configuration class BLACKMISC_EXPORT CBuildConfig { public: @@ -141,9 +141,9 @@ namespace BlackMisc static const auto pk = QString { \"$$VATSIM_CLIENT_PRIVATE_KEY\" }; return pk; } - }; + //! Version class BLACKMISC_EXPORT CVersion { public: @@ -170,9 +170,7 @@ namespace BlackMisc private: //! Parts of version string 1.0.2 static QList getVersionParts(const QString &versionString); - }; - } -#endif // BLACKCONFIG_H +#endif // guard