diff options
Diffstat (limited to 'tests/auto/qsensor/test_sensor.h')
| -rw-r--r-- | tests/auto/qsensor/test_sensor.h | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/tests/auto/qsensor/test_sensor.h b/tests/auto/qsensor/test_sensor.h index 1adb06a6..f75db083 100644 --- a/tests/auto/qsensor/test_sensor.h +++ b/tests/auto/qsensor/test_sensor.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtSensors 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef TEST_SENSOR_H #define TEST_SENSOR_H @@ -56,14 +31,14 @@ class TestSensor : public QSensor Q_OBJECT public: explicit TestSensor(QObject *parent = 0) - : QSensor(TestSensor::type, parent) + : QSensor(TestSensor::sensorType, parent) , sensorsChangedEmitted(0) { connect(this, SIGNAL(availableSensorsChanged()), this, SLOT(s_availableSensorsChanged())); } virtual ~TestSensor() {} TestSensorReading *reading() const { return static_cast<TestSensorReading*>(QSensor::reading()); } - static const char *type; + static const char *sensorType; // used by the testSensorsChangedSignal test function int sensorsChangedEmitted; |