haraldwolff
/
AusweisApp2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix linux release build if bluetooth is unavailable

pull/5/head
André Klitzing 2017-09-15 15:14:21 +02:00
parent 8fce07113d
commit 38c4245d1c
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/MetaTypeRegister.cpp
View File

@ -10,7 +10,7 @@
#include "command/BaseCardCommand.h"
#include "command/CreateCardConnectionCommand.h"
#if defined(Q_OS_LINUX) || defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
#if (defined(Q_OS_LINUX) && !defined(QT_NO_DEBUG)) || defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
#include "messages/BluetoothMessage.h"
#endif
@ -41,7 +41,7 @@ void registerMetaTypes()
qRegisterMetaType<QLowEnergyDescriptor>("QLowEnergyDescriptor");
#endif
#if defined(Q_OS_LINUX) || defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
#if (defined(Q_OS_LINUX) && !defined(QT_NO_DEBUG)) || defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
BluetoothMessage::registerMetaTypes();
#endif
}

1
src/card/bluetooth/BluetoothReader.h
View File

@ -13,7 +13,6 @@
#include "Reader.h"
#include <QBluetoothDeviceInfo>
#include <QBluetoothLocalDevice>
#include <QLowEnergyController>

4
src/qml/ApplicationModel.cpp
View File

@ -11,7 +11,7 @@
#include "ReaderManager.h"
#include "SingletonHelper.h"
#if defined(Q_OS_LINUX) || defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
#if (defined(Q_OS_LINUX) && !defined(QT_NO_DEBUG)) || defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
#include <QBluetoothLocalDevice>
#endif
@ -127,7 +127,7 @@ QString ApplicationModel::getCurrentWorkflow() const
void ApplicationModel::setBluetoothEnabled(bool pEnabled)
{
#if defined(Q_OS_LINUX) || defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
#if (defined(Q_OS_LINUX) && !defined(QT_NO_DEBUG)) || defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
if (pEnabled)
{
QBluetoothLocalDevice localDevice;