From 6d610e2a2537048dd3908c53847d3bea4c8f2471 Mon Sep 17 00:00:00 2001 From: Lauri Laanmets Date: Mon, 29 Jan 2018 16:10:05 +0200 Subject: Don't require pairing when connecting to BLE on WinRT If we are running on a Windows version with Creators Update or newer (>=15063) we can use new bluetooth low energy API that allows us to do device discovery without the requirement of having paired the device. Instead of connecting to the device and fetching its services, we can use UUIDs from advertisement packages to get an initial service list. By using that approach we can get rid of the pairing process in 'connectToDevice' and replace it with 'GetGattServicesAsync' if no services are yet available. The old behavior was kept as a fallback for the case where the device has already been paired. If the backend is built with an older Windows Kit or the machine running the application does not support the new API we fall back to the old implementation which still requires pairing. Task-number: QTBUG-58660 Change-Id: Ice262d4d993a0119efb8b6c8fe9a21830717569f Reviewed-by: Alex Blasche --- config.tests/winrt_btle_no_pairing/main.cpp | 40 ++++++++++++++++++++++++++++ config.tests/winrt_btle_no_pairing/winrt.pro | 3 +++ 2 files changed, 43 insertions(+) create mode 100644 config.tests/winrt_btle_no_pairing/main.cpp create mode 100644 config.tests/winrt_btle_no_pairing/winrt.pro (limited to 'config.tests') diff --git a/config.tests/winrt_btle_no_pairing/main.cpp b/config.tests/winrt_btle_no_pairing/main.cpp new file mode 100644 index 00000000..665e357a --- /dev/null +++ b/config.tests/winrt_btle_no_pairing/main.cpp @@ -0,0 +1,40 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtConnectivity module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +#if defined(_WIN32) && defined(__INTEL_COMPILER) +#error "Windows ICC fails to build the WinRT backend (QTBUG-68026)." +#endif + +int main() +{ + (void)Microsoft::WRL::ComPtr().Get(); + return 0; +} diff --git a/config.tests/winrt_btle_no_pairing/winrt.pro b/config.tests/winrt_btle_no_pairing/winrt.pro new file mode 100644 index 00000000..d60fd242 --- /dev/null +++ b/config.tests/winrt_btle_no_pairing/winrt.pro @@ -0,0 +1,3 @@ +SOURCES += main.cpp + +!winrt: LIBS += runtimeobject.lib -- cgit v1.2.3