From 23f32792ad53e23bbafbff6d7667f0bb0f69fc53 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Thu, 21 Oct 2021 17:27:08 +0200 Subject: Remove QtPositioning module from qtlocation.git Turns out that our CI does not support repos without any tests. This is treated like an error and leads to integration failure. This patch fixes it by disabling tests in coin/module_config.yaml. This config should be fixed when QtLocation tests are enabled Pick-to: 6.2 Task-number: QTBUG-97084 Change-Id: Ib06e865fe2836806bbbee34345f06b471dd48660 Reviewed-by: Qt CI Bot Reviewed-by: Alex Blasche --- .../android/src/qgeopositioninfosource_android_p.h | 102 --------------------- 1 file changed, 102 deletions(-) delete mode 100644 src/plugins/position/android/src/qgeopositioninfosource_android_p.h (limited to 'src/plugins/position/android/src/qgeopositioninfosource_android_p.h') diff --git a/src/plugins/position/android/src/qgeopositioninfosource_android_p.h b/src/plugins/position/android/src/qgeopositioninfosource_android_p.h deleted file mode 100644 index 44cb2799..00000000 --- a/src/plugins/position/android/src/qgeopositioninfosource_android_p.h +++ /dev/null @@ -1,102 +0,0 @@ -/**************************************************************************** -** -** 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:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QGEOPOSITIONINFOSOURCE_ANDROID_P_H -#define QGEOPOSITIONINFOSOURCE_ANDROID_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -class QGeoPositionInfoSourceAndroid : public QGeoPositionInfoSource -{ - Q_OBJECT -public: - QGeoPositionInfoSourceAndroid(QObject *parent = 0); - ~QGeoPositionInfoSourceAndroid(); - - // From QGeoPositionInfoSource - void setUpdateInterval(int msec) override; - QGeoPositionInfo lastKnownPosition(bool fromSatellitePositioningMethodsOnly = false) const override; - PositioningMethods supportedPositioningMethods() const override; - void setPreferredPositioningMethods(PositioningMethods methods) override; - int minimumUpdateInterval() const override; - Error error() const override; - -public Q_SLOTS: - virtual void startUpdates() override; - virtual void stopUpdates() override; - - virtual void requestUpdate(int timeout = 0) override; - - void processPositionUpdate(const QGeoPositionInfo& pInfo); - void processSinglePositionUpdate(const QGeoPositionInfo& pInfo); - - void locationProviderDisabled(); - void locationProvidersChanged(); -private Q_SLOTS: - void requestTimeout(); - void regularUpdatesTimeout(); - -private: - void reconfigureRunningSystem(); - void setError(Error error); - - bool updatesRunning = false; - int androidClassKeyForUpdate; - int androidClassKeyForSingleRequest; - QList queuedSingleUpdates; - Error m_error = NoError; - QTimer m_requestTimer; - QTimer m_regularUpdatesTimer; - qint64 m_lastUpdateTime = 0; - bool m_regularUpdatesErrorRaised = false; -}; - -#endif // QGEOPOSITIONINFOSOURCE_ANDROID_P_H -- cgit v1.2.1