refs #625, refs #614 integration of client id fix

This commit is contained in:
Klaus Basan
2016-04-05 00:12:41 +02:00
parent f5942347f2
commit 17ce1eef34
3 changed files with 6 additions and 7 deletions

View File

@@ -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();

View File

@@ -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

View File

@@ -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<int> getVersionParts(const QString &versionString);
};
}
#endif // BLACKCONFIG_H
#endif // guard