Unify winrt configure tests

The "newer" API has been available since Windows 10 1703 (SDK version
15063) is much older than Qt6's minimum Windows 10 version (1809/SDK 17763).

This patch is a preparation for a followup which will clean more of the
code base.

Change-Id: I58c3be4cfc19bfd8049ddbd49549c220c0c123fd
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

3 files changed, 1 insertions, 64 deletions

diff --git a/config.tests/winrt_bt/main.cpp b/config.tests/winrt_bt/main.cpp
index 85c26bf7..45c90e6c 100644
--- a/config.tests/winrt_bt/main.cpp
+++ b/config.tests/winrt_bt/main.cpp
@@ -40,6 +40,7 @@ int main()
     ABI::Windows::Foundation::GetActivationFactory(Microsoft::WRL::Wrappers::HString::MakeReference
         (RuntimeClass_Windows_Devices_Enumeration_DeviceInformation).Get(), &deviceInformationStatics);
 
+    (void)Microsoft::WRL::ComPtr<ABI::Windows::Devices::Bluetooth::GenericAttributeProfile::IGattDeviceService3>().Get();
     (void)Microsoft::WRL::ComPtr<ABI::Windows::Devices::Bluetooth::IBluetoothDevice>().Get();
     (void)Microsoft::WRL::ComPtr<ABI::Windows::Devices::Bluetooth::IBluetoothLEDevice>().Get();
     return 0;
diff --git a/config.tests/winrt_btle_no_pairing/CMakeLists.txt b/config.tests/winrt_btle_no_pairing/CMakeLists.txt
deleted file mode 100644
index 6194843b..00000000
--- a/config.tests/winrt_btle_no_pairing/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-cmake_minimum_required(VERSION 3.14.0)
-project(config_test_winrt LANGUAGES C CXX)
-
-foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES})
-    find_package(${p})
-endforeach()
-
-if(QT_CONFIG_COMPILE_TEST_LIBRARIES)
-    link_libraries(${QT_CONFIG_COMPILE_TEST_LIBRARIES})
-endif()
-if(QT_CONFIG_COMPILE_TEST_LIBRARY_TARGETS)
-    foreach(lib ${QT_CONFIG_COMPILE_TEST_LIBRARY_TARGETS})
-        if(TARGET ${lib})
-            link_libraries(${lib})
-        endif()
-    endforeach()
-endif()
-
-add_executable(${PROJECT_NAME}
-    main.cpp
-)
-target_link_libraries(${PROJECT_NAME} PUBLIC
-    runtimeobject.lib
-)
diff --git a/config.tests/winrt_btle_no_pairing/main.cpp b/config.tests/winrt_btle_no_pairing/main.cpp
deleted file mode 100644
index 665e357a..00000000
--- a/config.tests/winrt_btle_no_pairing/main.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** 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 <wrl.h>
-#include <windows.devices.bluetooth.h>
-
-#if defined(_WIN32) && defined(__INTEL_COMPILER)
-#error "Windows ICC fails to build the WinRT backend (QTBUG-68026)."
-#endif
-
-int main()
-{
-    (void)Microsoft::WRL::ComPtr<ABI::Windows::Devices::Bluetooth::GenericAttributeProfile::IGattDeviceService3>().Get();
-    return 0;
-}