From a3cb74a7ce3d4d138deb2e895288a36a1b3ce3ce Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Tue, 20 Jan 2015 11:48:16 +1000 Subject: Remove dependency on libgeoclue. Re-implement Geoclue plugin using only Qt DBus dropping both the build-time and run-time dependency on libgeoclue. Allowing the Geoclue plugin to be build on all platforms that support Qt DBus. The priority of the Geoclue plugin has been lowered slightly so that the native position plugin, if available, has precedence. [ChangeLog][QtPositioning][Position] The Geoclue plugin has been re-implemented using Qt DBus. Task-number: QTBUG-40702 Change-Id: Ia06d089bfb46c10769ccffd765c044c361a9b484 Reviewed-by: Alex Blasche --- .../geoclue-satellite/geoclue-satellite.pro | 6 --- config.tests/geoclue-satellite/main.cpp | 41 ------------------ config.tests/geoclue/geoclue.pro | 6 --- config.tests/geoclue/main.cpp | 48 ---------------------- 4 files changed, 101 deletions(-) delete mode 100644 config.tests/geoclue-satellite/geoclue-satellite.pro delete mode 100644 config.tests/geoclue-satellite/main.cpp delete mode 100644 config.tests/geoclue/geoclue.pro delete mode 100644 config.tests/geoclue/main.cpp (limited to 'config.tests') diff --git a/config.tests/geoclue-satellite/geoclue-satellite.pro b/config.tests/geoclue-satellite/geoclue-satellite.pro deleted file mode 100644 index 1ebc2e84..00000000 --- a/config.tests/geoclue-satellite/geoclue-satellite.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = app -unix { - CONFIG += link_pkgconfig - PKGCONFIG += geoclue -} -SOURCES += main.cpp diff --git a/config.tests/geoclue-satellite/main.cpp b/config.tests/geoclue-satellite/main.cpp deleted file mode 100644 index 60bd30a0..00000000 --- a/config.tests/geoclue-satellite/main.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Jolla Ltd, author: Aaron McCarthy -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtLocation module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -int main() -{ - GeoclueSatellite satellite; - - return 0; -} diff --git a/config.tests/geoclue/geoclue.pro b/config.tests/geoclue/geoclue.pro deleted file mode 100644 index 1ebc2e84..00000000 --- a/config.tests/geoclue/geoclue.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = app -unix { - CONFIG += link_pkgconfig - PKGCONFIG += geoclue -} -SOURCES += main.cpp diff --git a/config.tests/geoclue/main.cpp b/config.tests/geoclue/main.cpp deleted file mode 100644 index 08271c41..00000000 --- a/config.tests/geoclue/main.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Jolla Ltd. -** Contact: Aaron McCarthy -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtLocation module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -int main() -{ - GType type = geoclue_position_get_type(); - GeocluePosition position; - - type = geoclue_velocity_get_type(); - GeoclueVelocity velocity; - - return 0; -} -- cgit v1.2.1