From 439847b4f2ed31386d98802398fa7e8ad0ebf54e Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Fri, 10 Jun 2016 09:40:58 +0200 Subject: Add config test for winrt plugin The WinRT positioning plugin can also be compiled for the desktop. This support has been experimental and is now enabled by default via checking existence of the API on the build machine. [ChangeLog][Positioning][Windows] Enable WinRT backend for MSVC2013/2015 Task-number: QTBUG-53925 Change-Id: I674b14df2eee551b21e13e2f5a28de97ed5e4eeb Reviewed-by: Oliver Wolff --- config.tests/winrt/main.cpp | 43 +++++++++++++++++++++++++++++++++++++++ config.tests/winrt/winrt.pro | 5 +++++ qtlocation.pro | 1 + src/plugins/position/position.pro | 2 +- 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 config.tests/winrt/main.cpp create mode 100644 config.tests/winrt/winrt.pro diff --git a/config.tests/winrt/main.cpp b/config.tests/winrt/main.cpp new file mode 100644 index 00000000..e5a39008 --- /dev/null +++ b/config.tests/winrt/main.cpp @@ -0,0 +1,43 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtPositioning 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 +#include +#include + +using namespace Microsoft::WRL::Wrappers; +using namespace ABI::Windows::Devices::Geolocation; + +int main(int, char**) +{ + IGeolocator *locator; + RoActivateInstance(HString::MakeReference(RuntimeClass_Windows_Devices_Geolocation_Geolocator).Get(), + reinterpret_cast(&locator)); + return 0; +} diff --git a/config.tests/winrt/winrt.pro b/config.tests/winrt/winrt.pro new file mode 100644 index 00000000..1476abc9 --- /dev/null +++ b/config.tests/winrt/winrt.pro @@ -0,0 +1,5 @@ +SOURCES += main.cpp +win32-msvc201* { + LIBS += runtimeobject.lib + CONFIG += console +} diff --git a/qtlocation.pro b/qtlocation.pro index 3104465f..53069981 100644 --- a/qtlocation.pro +++ b/qtlocation.pro @@ -1,4 +1,5 @@ load(configure) qtCompileTest(gypsy) +qtCompileTest(winrt) load(qt_parts) diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro index df1930b3..4df733b9 100644 --- a/src/plugins/position/position.pro +++ b/src/plugins/position/position.pro @@ -2,10 +2,10 @@ TEMPLATE = subdirs qtHaveModule(dbus):SUBDIRS += geoclue config_gypsy:SUBDIRS += gypsy +config_winrt:SUBDIRS += winrt qtHaveModule(simulator):SUBDIRS += simulator osx|ios|tvos:SUBDIRS += corelocation android:SUBDIRS += android -winrt:SUBDIRS += winrt win32:qtHaveModule(serialport):SUBDIRS += serialnmea SUBDIRS += \ -- cgit v1.2.1