refs #613, changes as proposed by MS

https://dev.vatsim-germany.org/issues/613#note-3
This commit is contained in:
Klaus Basan
2016-04-23 14:25:14 +02:00
parent 8da559a186
commit 48bcb105cd
5 changed files with 6 additions and 13 deletions

View File

@@ -209,7 +209,7 @@ namespace BlackMisc
return s;
}
const QString CLivery::getStandardCode(const CAirlineIcaoCode &airline)
QString CLivery::getStandardCode(const CAirlineIcaoCode &airline)
{
QString code(airline.getDesignator());
return code.isEmpty() ? "" : code.append('.').append(standardLiveryMarker());

View File

@@ -155,7 +155,7 @@ namespace BlackMisc
static const QString &standardLiveryMarker();
//! Standard code for
static const QString getStandardCode(const BlackMisc::Aviation::CAirlineIcaoCode &airline);
static QString getStandardCode(const BlackMisc::Aviation::CAirlineIcaoCode &airline);
//! Color livery marker
static const QString &colorLiveryMarker();

View File

@@ -11,14 +11,8 @@ contains(BLACK_CONFIG, Static) {
}
buildconfig.input = buildconfig.cpp.in
CONFIG(debug, debug|release) {
buildconfig.output = $$OUT_PWD/debug/buildconfig_gen.cpp
GENERATED_SOURCES += $$OUT_PWD/debug/buildconfig_gen.cpp
} else {
buildconfig.output = $$OUT_PWD/release/buildconfig_gen.cpp
GENERATED_SOURCES += $$OUT_PWD/release/buildconfig_gen.cpp
}
buildconfig.output = $$DestRoot/buildconfig_gen.cpp
GENERATED_SOURCES += $$DestRoot/buildconfig_gen.cpp
QMAKE_SUBSTITUTES += buildconfig
INCLUDEPATH += ..