From 56c26ba5de5e8cb5999d6892d3c87d41e66f6e56 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 14 Dec 2012 20:03:41 +0100 Subject: remove obsolete DEPENDPATH assignments qmake now add CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: I27122f2dfe738e9504704a5632d09c964481a05c Reviewed-by: Joerg Bornemann --- tests/auto/legacy_sensors/legacy_sensors.pro | 1 - tests/auto/qsensorgestureplugins/qsensorgestureplugins.pro | 1 - 2 files changed, 2 deletions(-) (limited to 'tests') diff --git a/tests/auto/legacy_sensors/legacy_sensors.pro b/tests/auto/legacy_sensors/legacy_sensors.pro index b9c95d47..06a0babc 100644 --- a/tests/auto/legacy_sensors/legacy_sensors.pro +++ b/tests/auto/legacy_sensors/legacy_sensors.pro @@ -6,7 +6,6 @@ SOURCES += tst_legacy_sensors.cpp VPATH += ../qsensor INCLUDEPATH += ../qsensor -DEPENDPATH += ../qsensor HEADERS += \ test_backends.h diff --git a/tests/auto/qsensorgestureplugins/qsensorgestureplugins.pro b/tests/auto/qsensorgestureplugins/qsensorgestureplugins.pro index de73fd0b..2cc31a2c 100644 --- a/tests/auto/qsensorgestureplugins/qsensorgestureplugins.pro +++ b/tests/auto/qsensorgestureplugins/qsensorgestureplugins.pro @@ -9,7 +9,6 @@ SOURCES += tst_qsensorgesturepluginstest.cpp VPATH += ../qsensor INCLUDEPATH += ../qsensor -DEPENDPATH += ../qsensor HEADERS += \ test_backends.h -- cgit v1.2.3 From f7f1d56c1626f5b8eab5b4d5cac9fa06ee886e59 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Sun, 20 Jan 2013 19:40:59 +1000 Subject: remove nokia and replace with qt-project in plugins Change-Id: I63fa985991653e4b8465a7fb88acab647d8546e8 Reviewed-by: Thomas McGuire --- tests/auto/qsensor/test_sensorplugin.cpp | 2 +- tests/auto/qsensorgestures_gestures/mockbackends.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/auto/qsensor/test_sensorplugin.cpp b/tests/auto/qsensor/test_sensorplugin.cpp index 6aa27d95..d4cd90b4 100644 --- a/tests/auto/qsensor/test_sensorplugin.cpp +++ b/tests/auto/qsensor/test_sensorplugin.cpp @@ -54,7 +54,7 @@ class TestSensorPlugin : public QObject, public QSensorBackendFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "com.nokia.Qt.QSensorPluginInterface/1.0") + Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0") Q_INTERFACES(QSensorPluginInterface QSensorChangesInterface) public: void registerSensors() diff --git a/tests/auto/qsensorgestures_gestures/mockbackends.h b/tests/auto/qsensorgestures_gestures/mockbackends.h index dfd5525c..94174668 100644 --- a/tests/auto/qsensorgestures_gestures/mockbackends.h +++ b/tests/auto/qsensorgestures_gestures/mockbackends.h @@ -63,7 +63,7 @@ class mockSensorPlugin : public QObject, public QSensorBackendFactory { Q_OBJECT - // Q_PLUGIN_METADATA(IID "com.nokia.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") + // Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") Q_INTERFACES(QSensorPluginInterface) public: QString m_filename; -- cgit v1.2.3 From 5edba66c0ead13c4b1b7eb2cb7bd12780bd8c31f Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 11 Feb 2013 10:28:03 +0100 Subject: Generate the CMake test automatically. Change-Id: I4a478827e7724a46dda3725f760372d7420ac32f Reviewed-by: Lorn Potter --- tests/auto/cmake/CMakeLists.txt | 6 +++- tests/auto/cmake/test_modules/CMakeLists.txt | 23 ------------- tests/auto/cmake/test_modules/main.cpp | 49 ---------------------------- 3 files changed, 5 insertions(+), 73 deletions(-) delete mode 100644 tests/auto/cmake/test_modules/CMakeLists.txt delete mode 100644 tests/auto/cmake/test_modules/main.cpp (limited to 'tests') diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 4f15a69e..2c8e39e7 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -9,4 +9,8 @@ find_package(Qt5Core REQUIRED) include("${_Qt5CTestMacros}") -expect_pass(test_modules) +set(Qt5_MODULE_TEST_DEPENDS Core) + +test_module_includes( + Sensors QLightSensor +) diff --git a/tests/auto/cmake/test_modules/CMakeLists.txt b/tests/auto/cmake/test_modules/CMakeLists.txt deleted file mode 100644 index 6452e942..00000000 --- a/tests/auto/cmake/test_modules/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -project(test_modules) - -find_package(Qt5Core REQUIRED) - -find_package(Qt5Sensors REQUIRED) - -include_directories( - ${Qt5Sensors_INCLUDE_DIRS} -) - -add_definitions( - ${Qt5Sensors_DEFINITIONS} -) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") - -add_executable(mainapp main.cpp) -target_link_libraries(mainapp - ${Qt5Sensors_LIBRARIES} -) diff --git a/tests/auto/cmake/test_modules/main.cpp b/tests/auto/cmake/test_modules/main.cpp deleted file mode 100644 index cec9d4ca..00000000 --- a/tests/auto/cmake/test_modules/main.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -** Contact: http://www.qt-project.org/legal -** -** This file is part of the test suite 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -int main(int argc, char **argv) -{ - QLightSensor lightSensor; - - return 0; -} -- cgit v1.2.3