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

Link CBuildConfig and CVersion into static library blackconfig

Browse Source 
CBuildConfig including private keys etc. should not be part of a
public library API. Therefore link it into a static library, which
is not available to end users.

refs #645
This commit is contained in:
Roland Winklmeier
2016-05-24 13:12:23 +02:00
parent 26a78ac2a6
commit 2d8f56a598
40 changed files with 135 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackgui/views/atcstationview.cpp
View File

@@ -7,12 +7,12 @@
* contained in the LICENSE file.
*/
#include "blackconfig/buildconfig.h"
#include "blackgui/menus/menuaction.h"
#include "blackgui/models/atcstationlistmodel.h"
#include "blackgui/views/atcstationview.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/buildconfig.h"
#include "blackmisc/icons.h"
#include <QFlags>
@@ -49,7 +49,7 @@ namespace BlackGui
void CAtcStationView::customMenu(CMenuActions &menuActions)
{
if (BlackMisc::CBuildConfig::isDebugBuild())
if (BlackConfig::CBuildConfig::isDebugBuild())
{
if (this->m_debugActions.isEmpty()) { this->m_actions = QList<QAction *>({nullptr, nullptr}); }
this->m_actions[0] = menuActions.addAction(this->m_actions[0], CIcons::tableSheet16(), "Test: 1k ATC online stations", CMenuAction::pathClientCom(), { this, &CAtcStationView::ps_testRequest1kAtcOnlineDummies });

4
src/blackgui/views/simulatedaircraftview.cpp
View File

@@ -7,11 +7,11 @@
* contained in the LICENSE file.
*/
#include "blackconfig/buildconfig.h"
#include "blackgui/models/simulatedaircraftlistmodel.h"
#include "blackgui/menus/menuaction.h"
#include "blackgui/views/simulatedaircraftview.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/buildconfig.h"
#include "blackmisc/icons.h"
#include "blackmisc/simulation/simulatedaircraft.h"
@@ -48,7 +48,7 @@ namespace BlackGui
void CSimulatedAircraftView::customMenu(CMenuActions &menuActions)
{
if (BlackMisc::CBuildConfig::isDebugBuild())
if (BlackConfig::CBuildConfig::isDebugBuild())
{
// tbd
}

3
src/blackgui/views/viewbase.cpp
View File

@@ -7,6 +7,7 @@
* contained in the LICENSE file.
*/
#include "blackconfig/buildconfig.h"
#include "blackgui/dockwidgetinfoarea.h"
#include "blackgui/filters/filterdialog.h"
#include "blackgui/filters/filterwidget.h"
@@ -28,7 +29,6 @@
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/livery.h"
#include "blackmisc/aviation/liverylist.h"
#include "blackmisc/buildconfig.h"
#include "blackmisc/country.h"
#include "blackmisc/countrylist.h"
#include "blackmisc/fileutils.h"
@@ -78,6 +78,7 @@
#include <QWidget>
#include <limits>
using namespace BlackConfig;
using namespace BlackMisc;
using namespace BlackGui;
using namespace BlackGui::Menus;