Index: denali.pro =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- denali.pro (.../denali.pro) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ denali.pro (.../denali.pro) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -1,4 +1,4 @@ -QT += widgets qml quick serialbus concurrent +QT += widgets qml quick serialbus concurrent bluetooth CONFIG += c++17 warn_on QMAKE_CXXFLAGS += -Wall -Werror -Wimplicit-fallthrough # -save-temps # see .ii and .s files @@ -20,6 +20,16 @@ # deprecated API to know how to port your code away from it. DEFINES += QT_DEPRECATED_WARNINGS +linux-g++ { + message("Building for desktop") + DEFINES += BUILD_FOR_DESKTOP +} + +linux-oe-generic-g++ { + message("Building for target") + DEFINES += BUILD_FOR_TARGET +} + # You can also make your code fail to compile if it uses deprecated APIs. # In order to do so, uncomment the following line. # You can also select to disable deprecated APIs only up to a certain version of Qt. @@ -31,6 +41,7 @@ sources/storage \ sources/gui \ sources/canbus \ + sources/bluetooth \ sources/utility \ sources/abstract \ sources/model \ @@ -120,6 +131,8 @@ \ # CANBus sources/canbus/CanInterface.h \ sources/canbus/FrameInterface.h \ + \ # Bluetooth + sources/bluetooth/BLEScanner.h \ \ # Denali Message sources/canbus/MessageGlobals.h \ sources/canbus/MessageAcknowModel.h \ @@ -131,12 +144,16 @@ sources/gui/GuiView.h \ sources/gui/GuiController.h \ \ # ---------- Views ---------- + sources/view/VAlert.h \ + sources/view/VBluetooth.h \ + sources/view/VBluetoothDeviceInfo.h \ sources/view/VTreatmentCreate.h \ sources/view/VTreatmentBegin.h \ sources/view/VEventSpy.h \ sources/view/VView.h \ sources/view/VPowerOff.h \ sources/view/VPriming.h \ + sources/view/VVitals.h \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.h \ \ # ---------- Views - HD - Adjustment @@ -265,6 +282,8 @@ \ # CANBus sources/canbus/CanInterface.cpp \ sources/canbus/FrameInterface.cpp \ + \ # Bluetooth + sources/bluetooth/BLEScanner.cpp \ \ # Denali Message sources/canbus/MessageAcknowModel.cpp \ sources/canbus/MessageBuilder.cpp \ @@ -275,11 +294,15 @@ sources/gui/GuiView.cpp \ sources/gui/GuiController.cpp \ \ # ---------- Views ---------- + sources/view/VAlert.cpp \ + sources/view/VBluetooth.cpp \ + sources/view/VBluetoothDeviceInfo.cpp \ sources/view/VTreatmentCreate.cpp \ sources/view/VTreatmentBegin.cpp \ sources/view/VEventSpy.cpp \ sources/view/VPriming.cpp \ sources/view/VPowerOff.cpp \ + sources/view/VVitals.cpp \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.cpp \ \ # ---------- Views - HD - Adjustment