mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-21 04:45:31 +08:00
Link CBuildConfig and CVersion into static library blackconfig
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:
@@ -4,7 +4,7 @@ QT += network dbus gui svg widgets
|
||||
|
||||
TARGET = blackgui
|
||||
TEMPLATE = lib
|
||||
CONFIG += blackmisc blackcore
|
||||
CONFIG += blackconfig blackmisc blackcore
|
||||
|
||||
contains(BLACK_CONFIG, Static) {
|
||||
CONFIG += staticlib
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
* contained in the LICENSE file.
|
||||
*/
|
||||
|
||||
#include "blackconfig/buildconfig.h"
|
||||
#include "blackcore/webdataservices.h"
|
||||
#include "blackgui/components/datainfoareacomponent.h"
|
||||
#include "blackgui/components/dbaircrafticaocomponent.h"
|
||||
@@ -16,7 +17,6 @@
|
||||
#include "blackgui/components/dbliverycomponent.h"
|
||||
#include "blackgui/components/dbmodelcomponent.h"
|
||||
#include "blackgui/guiapplication.h"
|
||||
#include "blackmisc/buildconfig.h"
|
||||
#include "blackmisc/icons.h"
|
||||
#include "blackmisc/logmessage.h"
|
||||
#include "blackmisc/network/entityflags.h"
|
||||
@@ -29,6 +29,7 @@
|
||||
#include <QTabWidget>
|
||||
#include <QtGlobal>
|
||||
|
||||
using namespace BlackConfig;
|
||||
using namespace BlackMisc;
|
||||
using namespace BlackMisc::Network;
|
||||
using namespace BlackGui;
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
* contained in the LICENSE file.
|
||||
*/
|
||||
|
||||
#include "blackconfig/buildconfig.h"
|
||||
#include "blackcore/contextapplication.h"
|
||||
#include "blackcore/contextaudio.h"
|
||||
#include "blackcore/contextnetwork.h"
|
||||
@@ -16,7 +17,6 @@
|
||||
#include "blackgui/guiapplication.h"
|
||||
#include "blackgui/led.h"
|
||||
#include "blackmisc/audio/audioutils.h"
|
||||
#include "blackmisc/buildconfig.h"
|
||||
#include "blackmisc/network/server.h"
|
||||
#include "blackmisc/simulation/simulatorplugininfo.h"
|
||||
#include "ui_infobarstatuscomponent.h"
|
||||
@@ -29,6 +29,7 @@
|
||||
#include <Qt>
|
||||
#include <QtGlobal>
|
||||
|
||||
using namespace BlackConfig;
|
||||
using namespace BlackCore;
|
||||
using namespace BlackGui;
|
||||
using namespace BlackMisc;
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
* contained in the LICENSE file.
|
||||
*/
|
||||
|
||||
#include "blackconfig/buildconfig.h"
|
||||
#include "blackcore/contextaudio.h"
|
||||
#include "blackcore/contextnetwork.h"
|
||||
#include "blackcore/contextownaircraft.h"
|
||||
@@ -24,7 +25,6 @@
|
||||
#include "blackmisc/aviation/aircrafticaocode.h"
|
||||
#include "blackmisc/aviation/airlineicaocode.h"
|
||||
#include "blackmisc/aviation/airporticaocode.h"
|
||||
#include "blackmisc/buildconfig.h"
|
||||
#include "blackmisc/icons.h"
|
||||
#include "blackmisc/logmessage.h"
|
||||
#include "blackmisc/network/entityflags.h"
|
||||
@@ -45,6 +45,7 @@
|
||||
#include <QToolButton>
|
||||
#include <QtGlobal>
|
||||
|
||||
using namespace BlackConfig;
|
||||
using namespace BlackMisc;
|
||||
using namespace BlackMisc::Aviation;
|
||||
using namespace BlackMisc::Network;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
* contained in the LICENSE file.
|
||||
*/
|
||||
|
||||
#include "blackconfig/buildconfig.h"
|
||||
#include "blackcore/contextapplication.h"
|
||||
#include "blackcore/data/globalsetup.h"
|
||||
#include "blackgui/components/serverform.h"
|
||||
#include "blackgui/components/settingsnetworkserverscomponent.h"
|
||||
#include "blackgui/guiapplication.h"
|
||||
#include "blackgui/views/serverview.h"
|
||||
#include "blackmisc/buildconfig.h"
|
||||
#include "blackmisc/logmessage.h"
|
||||
#include "blackmisc/network/server.h"
|
||||
#include "blackmisc/network/serverlist.h"
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <QString>
|
||||
#include <QTableView>
|
||||
|
||||
using namespace BlackConfig;
|
||||
using namespace BlackCore;
|
||||
using namespace BlackCore::Data;
|
||||
using namespace BlackGui;
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
* contained in the LICENSE file.
|
||||
*/
|
||||
|
||||
#include "blackconfig/buildconfig.h"
|
||||
#include "blackcore/data/globalsetup.h"
|
||||
#include "blackcore/data/updateinfo.h"
|
||||
#include "blackgui/guiapplication.h"
|
||||
#include "blackgui/guiutility.h"
|
||||
#include "blackgui/registermetadata.h"
|
||||
#include "blackmisc/buildconfig.h"
|
||||
#include "blackmisc/datacache.h"
|
||||
#include "blackmisc/logcategory.h"
|
||||
#include "blackmisc/logcategorylist.h"
|
||||
@@ -42,6 +42,7 @@
|
||||
#include <QWidget>
|
||||
#include <QtGlobal>
|
||||
|
||||
using namespace BlackConfig;
|
||||
using namespace BlackMisc;
|
||||
|
||||
BlackGui::CGuiApplication *sGui = nullptr; // set by constructor
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
* contained in the LICENSE file.
|
||||
*/
|
||||
|
||||
#include "blackconfig/buildconfig.h"
|
||||
#include "blackgui/stylesheetutility.h"
|
||||
#include "blackmisc/buildconfig.h"
|
||||
#include "blackmisc/fileutils.h"
|
||||
#include "blackmisc/restricted.h"
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <QWidget>
|
||||
#include <QtGlobal>
|
||||
|
||||
using namespace BlackConfig;
|
||||
using namespace BlackMisc;
|
||||
|
||||
namespace BlackGui
|
||||
|
||||
@@ -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 });
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user