prepare android version for Qt6

This commit is contained in:
pls.153 2024-03-21 13:38:53 +01:00
parent 33b00e4300
commit a18e49e138
9 changed files with 146 additions and 16 deletions

View file

@ -1,6 +1,11 @@
#include "qtandroidservice_ro.h"
#include "../ble/ble_meshtastic.h"
#include <QAndroidService>
#if (QT_VERSION < 0x060000)
#include <QAndroidService>
#else
#include <QtCore/private/qandroidextras_p.h>
#endif
int main(int argc, char* argv[]) {
QAndroidService app(argc, argv);

View file

@ -1,9 +1,18 @@
QT += core androidextras bluetooth remoteobjects
QT += core bluetooth remoteobjects
TEMPLATE = lib
CONFIG += dll
CONFIG += c++17 dll
INCLUDEPATH += $$PWD
TARGET = service
DESTDIR = ../../build-android
OBJECTS_DIR = ./tmp
MOC_DIR = ./tmp
equals(QT_MAJOR_VERSION, 6) {
QT += core-private
}
lessThan(QT_MAJOR_VERSION, 6) {
QT += androidextras
}
HEADERS += \
../ble/ble.h \