diff --git a/OmobiDisplayApp/OmobiDisplayApp.pro b/OmobiDisplayApp/OmobiDisplayApp.pro index cbb9d46..05717a1 100644 --- a/OmobiDisplayApp/OmobiDisplayApp.pro +++ b/OmobiDisplayApp/OmobiDisplayApp.pro @@ -1,16 +1,20 @@ QT += quick bluetooth - CONFIG += c++11 console +TARGET = OmobiDisplayApp + +TEMPLATE = app + # You can make your code fail to compile if it uses deprecated APIs. # In order to do so, uncomment the following line. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 SOURCES += \ - bluetoothdeviceinfo.cpp \ main.cpp \ - omobidisplaybackend.cpp \ - qbluetoothleuart.cpp + omobidisplaybackend.cpp + +HEADERS += \ + omobidisplaybackend.h RESOURCES += qml.qrc @@ -25,7 +29,5 @@ qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -HEADERS += \ - bluetoothdeviceinfo.h \ - omobidisplaybackend.h \ - qbluetoothleuart.h +CONFIG += QBluetoothLeUart_QML +include($$PWD/QBluetoothLeUart/QBluetoothLeUart.pri) diff --git a/OmobiDisplayApp/OmobiDisplayApp.pro.user b/OmobiDisplayApp/OmobiDisplayApp.pro.user index 0e13899..e0f3e08 100644 --- a/OmobiDisplayApp/OmobiDisplayApp.pro.user +++ b/OmobiDisplayApp/OmobiDisplayApp.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -323,8 +323,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:/home/dorian/Documents/Programmieren/Qt/OmobiDisplayApp/OmobiDisplayApp.pro - /home/dorian/Documents/Programmieren/Qt/OmobiDisplayApp/OmobiDisplayApp.pro + Qt4ProjectManager.Qt4RunConfiguration:/home/dorian/Documents/git/omobileddisplay/OmobiDisplayApp/OmobiDisplayApp.pro + /home/dorian/Documents/git/omobileddisplay/OmobiDisplayApp/OmobiDisplayApp.pro false @@ -340,307 +340,9 @@ 1 - - ProjectExplorer.Project.Target.1 - - Android.Device.Type - Android Qt 5.12.6 Clang armeabi-v7a - Android Qt 5.12.6 Clang armeabi-v7a - {9a47ee8f-1702-4ae9-96f9-7c13c7a1f9b3} - 0 - 0 - 0 - - true - 0 - /home/dorian/Qt/builds/build-OmobiDisplayApp-Android_Qt_5_12_6_Clang_armeabi_v7a-Debug - /home/dorian/Qt/builds/build-OmobiDisplayApp-Android_Qt_5_12_6_Clang_armeabi_v7a-Debug - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - - true - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-29 - - true - QmakeProjectManager.AndroidBuildApkStep - false - - 4 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 2 - 2 - - - true - 2 - /home/dorian/Qt/builds/build-OmobiDisplayApp-Android_Qt_5_12_6_Clang_armeabi_v7a-Release - /home/dorian/Qt/builds/build-OmobiDisplayApp-Android_Qt_5_12_6_Clang_armeabi_v7a-Release - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - - true - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-29 - - true - QmakeProjectManager.AndroidBuildApkStep - false - - 4 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 2 - - - true - 0 - /home/dorian/Qt/builds/build-OmobiDisplayApp-Android_Qt_5_12_6_Clang_armeabi_v7a-Profile - /home/dorian/Qt/builds/build-OmobiDisplayApp-Android_Qt_5_12_6_Clang_armeabi_v7a-Profile - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - - true - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-29 - - true - QmakeProjectManager.AndroidBuildApkStep - false - - 4 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - 3 - - - - true - Qt4ProjectManager.AndroidDeployQtStep - false - - 1 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - Qt4ProjectManager.AndroidDeployConfiguration2 - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - - - - 0 - - OmobiDisplayApp - Qt4ProjectManager.AndroidRunConfiguration:/home/dorian/Documents/Programmieren/Qt/OmobiDisplayApp/OmobiDisplayApp.pro - /home/dorian/Documents/Programmieren/Qt/OmobiDisplayApp/OmobiDisplayApp.pro - - false - - false - true - false - false - true - - 1 - - ProjectExplorer.Project.TargetCount - 2 + 1 ProjectExplorer.Project.Updater.FileVersion diff --git a/OmobiDisplayApp/QBluetoothLeUart b/OmobiDisplayApp/QBluetoothLeUart index 8cc71db..49d6653 160000 --- a/OmobiDisplayApp/QBluetoothLeUart +++ b/OmobiDisplayApp/QBluetoothLeUart @@ -1 +1 @@ -Subproject commit 8cc71db6e2c0196f93f7c6ded6634b267b86e8f9 +Subproject commit 49d6653504ace7bc98f3211a8378da5b39b7c693 diff --git a/OmobiDisplayApp/omobidisplaybackend.cpp b/OmobiDisplayApp/omobidisplaybackend.cpp index 67e691b..11d8006 100644 --- a/OmobiDisplayApp/omobidisplaybackend.cpp +++ b/OmobiDisplayApp/omobidisplaybackend.cpp @@ -68,7 +68,7 @@ void OmobiDisplayBackend::handleBluetoothStateChange(QBluetoothLeUart::Bluetooth } } -void OmobiDisplayBackend::handleFoundNewDevice(BluetoothDeviceInfo* device) { +void OmobiDisplayBackend::handleFoundNewDevice(QBluetoothLeUartDevice* device) { qDebug() << "Found a device: name: " << device->getName() << " address: " << device->getAddress(); if(device->getName() == "ESP32 Chat Test") { diff --git a/OmobiDisplayApp/omobidisplaybackend.h b/OmobiDisplayApp/omobidisplaybackend.h index 94979e7..98c111a 100644 --- a/OmobiDisplayApp/omobidisplaybackend.h +++ b/OmobiDisplayApp/omobidisplaybackend.h @@ -2,7 +2,7 @@ #define OMOBIDISPLAYBACKEND_H #include -#include "qbluetoothleuart.h" +#include class OmobiDisplayBackend : public QObject { @@ -17,7 +17,7 @@ private: private slots: void handleBluetoothStateChange(QBluetoothLeUart::BluetoothLeUartState state); - void handleFoundNewDevice(BluetoothDeviceInfo* device); + void handleFoundNewDevice(QBluetoothLeUartDevice* device); void DataHandler(const QString &s); signals: