diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-10 03:00:22 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-10 03:00:22 +0200 |
| commit | ab4d6d0ac06020a6ba0ef660172985b4e3e877d2 (patch) | |
| tree | 5de0d85fe764e5448f828f7a202c0fbeb1daa2c1 | |
| parent | d0b7c165ced02f20f0da3b66854f4bec7b192e64 (diff) | |
| parent | 96afc728c508708da7a5fa16266dcafafcb60d0b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Icd522a25b5aecb7ce7f4068e13897e23d8e58a9f
| -rwxr-xr-x | src/bluetooth/bluez/generate | 4 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergycontroller_android.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/bluetooth/bluez/generate b/src/bluetooth/bluez/generate index caae92f6..5c401ffe 100755 --- a/src/bluetooth/bluez/generate +++ b/src/bluetooth/bluez/generate @@ -13,9 +13,9 @@ qdbusxml2cpp -a obex_agent_p.h:obex_agent.cpp org.openobex.agent.xml org.openobe #Bluez 5 qdbusxml2cpp -p adapter1_bluez5_p.h:adapter1_bluez5.cpp org.bluez.Adapter1.xml -qdbusxml2cpp -p device1_bluez5_p.h:device1_bluez5.cpp org.bluez.Device1.xml +qdbusxml2cpp -i bluez5_helper_p.h -p device1_bluez5_p.h:device1_bluez5.cpp org.bluez.Device1.xml qdbusxml2cpp -p profile1_p.h:profile1.cpp org.bluez.ProfileManager1.xml -qdbusxml2cpp -p objectmanager_p.h:objectmanager.cpp org.freedesktop.dbus.objectmanager.xml +qdbusxml2cpp -i bluez5_helper_p.h -p objectmanager_p.h:objectmanager.cpp org.freedesktop.dbus.objectmanager.xml qdbusxml2cpp -p properties_p.h:properties.cpp org.freedesktop.dbus.properties.xml qdbusxml2cpp -p obex_client1_bluez5_p.h:obex_client1_bluez5_p.h org.bluez.Client1.xml qdbusxml2cpp -p obex_objectpush1_bluez5_p.h:obex_objectpush1_bluez5.cpp org.bluez.obex.ObjectPush1.xml diff --git a/src/bluetooth/qlowenergycontroller_android.cpp b/src/bluetooth/qlowenergycontroller_android.cpp index 8dccb859..70b6098b 100644 --- a/src/bluetooth/qlowenergycontroller_android.cpp +++ b/src/bluetooth/qlowenergycontroller_android.cpp @@ -40,6 +40,7 @@ #include "qlowenergycontroller_android_p.h" #include <QtCore/QLoggingCategory> #include <QtAndroidExtras/QAndroidJniEnvironment> +#include <QtAndroidExtras/QAndroidJniObject> #include <QtBluetooth/QLowEnergyServiceData> #include <QtBluetooth/QLowEnergyCharacteristicData> #include <QtBluetooth/QLowEnergyDescriptorData> |