From 497a3c7ddadf5776b76e5369d2e452966c2bad15 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Tue, 18 Jul 2017 13:02:01 +0200 Subject: iOS: Do not include qlowenergycontroller_p.cpp if not needed Change-Id: Icdd0c9421f4894a7f84b69d31d4de440900f3d39 Reviewed-by: Timur Pocheptsov --- src/bluetooth/bluetooth.pro | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/bluetooth/bluetooth.pro') diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index 40b14a84..233cdb3b 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -183,11 +183,9 @@ qtConfig(bluez) { qbluetoothserviceinfo_p.cpp \ qbluetoothservicediscoveryagent_p.cpp \ qbluetoothsocket_p.cpp \ - qbluetoothserver_p.cpp \ - qlowenergycontroller_p.cpp + qbluetoothserver_p.cpp SOURCES -= qbluetoothdevicediscoveryagent.cpp - SOURCES -= qlowenergycontroller_p.cpp SOURCES -= qlowenergyservice.cpp SOURCES -= qlowenergycontroller.cpp } else:winrt { -- cgit v1.2.3 From dbd70341ea47122239ec90304f1d6c66c34a4acd Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Tue, 1 Aug 2017 09:27:22 +0200 Subject: Add configure test to detect presence of winrt API Instead of checking for a certain Windows version, we should check whether the API is actually available [ChangeLog][QtBluetooth][Windows] Enabled UWP backend for desktop Windows versions that support the API Task-number: QTBUG-61566 Change-Id: I8384119c70cc2c4bdcdbe6b297cfcf5fb3e3f534 Reviewed-by: Oswald Buddenhagen Reviewed-by: Maurice Kalinowski --- src/bluetooth/bluetooth.pro | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'src/bluetooth/bluetooth.pro') diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index 233cdb3b..b0e78d39 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -77,6 +77,11 @@ SOURCES += \ qlowenergycontroller.cpp \ qlowenergyserviceprivate.cpp +win32 { + WINDOWS_SDK_VERSION_STRING = $$(WindowsSDKVersion) + WINDOWS_SDK_VERSION = $$member($$list($$split(WINDOWS_SDK_VERSION_STRING, .)), 2) +} + qtConfig(bluez) { QT_PRIVATE = concurrent QT_FOR_PRIVATE += dbus @@ -188,8 +193,14 @@ qtConfig(bluez) { SOURCES -= qbluetoothdevicediscoveryagent.cpp SOURCES -= qlowenergyservice.cpp SOURCES -= qlowenergycontroller.cpp -} else:winrt { +} else: qtConfig(winrt_bt) { DEFINES += QT_WINRT_BLUETOOTH + !winrt { + SOURCES += qbluetoothutils_win.cpp + DEFINES += CLASSIC_APP_BUILD + LIBS += runtimeobject.lib + } + QT += core-private SOURCES += \ @@ -201,11 +212,9 @@ qtConfig(bluez) { qbluetoothsocket_winrt.cpp \ qlowenergycontroller_winrt.cpp - WINRT_SDK_VERSION_STRING = $$(UCRTVersion) - WINRT_SDK_VERSION = $$member($$list($$split(WINRT_SDK_VERSION_STRING, .)), 2) - lessThan(WINRT_SDK_VERSION, 14393) { + lessThan(WINDOWS_SDK_VERSION, 14393) { DEFINES += QT_WINRT_LIMITED_SERVICEDISCOVERY - DEFINES += QT_UCRTVERSION=$$WINRT_SDK_VERSION + DEFINES += QT_UCRTVERSION=$$WINDOWS_SDK_VERSION } } else { message("Unsupported Bluetooth platform, will not build a working QtBluetooth library.") -- cgit v1.2.3 From 36997810d9fec492635152be89efaa55208e224a Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Mon, 21 Aug 2017 14:20:25 +0200 Subject: Rename qbluetoothglobal.h to qtbluetoothglobal.h ... and deprecate the former. By doing so we get the header file in line with other modules - see qtnetworkglobal.h for example. The include is not used in the examples so it is removed there. Change-Id: Ie6267738d4a45e45a0350d458a40654d8a952f4a Reviewed-by: Oswald Buddenhagen Reviewed-by: Alex Blasche --- src/bluetooth/bluetooth.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/bluetooth/bluetooth.pro') diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index b0e78d39..8dd748c7 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -6,7 +6,7 @@ QMAKE_DOCS = $$PWD/doc/qtbluetooth.qdocconf OTHER_FILES += doc/src/*.qdoc # show .qdoc files in Qt Creator PUBLIC_HEADERS += \ - qbluetoothglobal.h \ + qtbluetoothglobal.h \ qbluetoothaddress.h\ qbluetoothhostinfo.h \ qbluetoothuuid.h\ -- cgit v1.2.3 From 17ee18f99ef8e6cd39d48e089e6e8ca4e01073cd Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Mon, 21 Aug 2017 14:35:36 +0200 Subject: Add missing qtbluetoothglobal_p.h Change-Id: I6d1d5b5e8084afdb0dd5082c344975dda5e66d1a Reviewed-by: Oswald Buddenhagen Reviewed-by: Alex Blasche --- src/bluetooth/bluetooth.pro | 1 + 1 file changed, 1 insertion(+) (limited to 'src/bluetooth/bluetooth.pro') diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index 8dd748c7..5f415341 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -33,6 +33,7 @@ PUBLIC_HEADERS += \ qlowenergycontroller.h PRIVATE_HEADERS += \ + qtbluetoothglobal_p.h \ qbluetoothaddress_p.h\ qbluetoothhostinfo_p.h \ qbluetoothdeviceinfo_p.h\ -- cgit v1.2.3 From ed5a1134d50f6dbed3fc568c799a39f4e2338056 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Fri, 30 Jun 2017 12:13:36 +0200 Subject: Bail out early if Bluetooth is used on an unsupported Windows version Task-number: QTBUG-61566 Change-Id: Ie40762dbb07e9f29d862e75eba2bc05da088a34c Reviewed-by: Alex Blasche --- src/bluetooth/bluetooth.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/bluetooth/bluetooth.pro') diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index 5f415341..b45da961 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -199,7 +199,7 @@ qtConfig(bluez) { !winrt { SOURCES += qbluetoothutils_win.cpp DEFINES += CLASSIC_APP_BUILD - LIBS += runtimeobject.lib + LIBS += runtimeobject.lib user32.lib } QT += core-private -- cgit v1.2.3 From dbb8f97bf3e3a50c6841ab79bbf4b5d6294b8d65 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 4 Sep 2017 22:09:04 -0700 Subject: Android: remove support for local/debug deployment This removes the pre-dexed JAR files activated by the absence of the bundled_jar_file CONFIG option, as versions of Android >= 5 no longer support this deployment mechanism. Now, the "bundled" JARs simply become normal JARs containing class files, and are neither activated by a bundled_jar_file CONFIG entry nor do they have a -bundled suffix in the file's base name. Task-number: QTBUG-62995 Change-Id: Ifc13542ff71844da7e80cefe9ff51e3d7cdfc830 Reviewed-by: Oswald Buddenhagen Reviewed-by: BogDan Vatra --- src/bluetooth/bluetooth.pro | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/bluetooth/bluetooth.pro') diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index b45da961..1ef7406b 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -126,8 +126,6 @@ qtConfig(bluez) { android.permission.BLUETOOTH_ADMIN \ android.permission.ACCESS_COARSE_LOCATION # since Android 6.0 (API lvl 23) ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/QtAndroidBluetooth-bundled.jar:org.qtproject.qt5.android.bluetooth.QtBluetoothBroadcastReceiver - ANDROID_JAR_DEPENDENCIES = \ jar/QtAndroidBluetooth.jar:org.qtproject.qt5.android.bluetooth.QtBluetoothBroadcastReceiver SOURCES += \ -- cgit v1.2.3