Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/plugins/sensors/generic/generictiltsensor.cpp
	src/sensors/qtapsensor.h
	sync.profile

Change-Id: I017a5fa8dffb69b41727495175c0fca9b76962e1

7 files changed, 7 insertions, 77 deletions

diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index 4f15a69..2c8e39e 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 6452e94..0000000
--- 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 cec9d4c..0000000
--- 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 <stephen.kelly@kdab.com>
-** 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 <QLightSensor>
-
-int main(int argc, char **argv)
-{
-    QLightSensor lightSensor;
-
-    return 0;
-}
diff --git a/tests/auto/legacy_sensors/legacy_sensors.pro b/tests/auto/legacy_sensors/legacy_sensors.pro
index b9c95d4..06a0bab 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/qsensor/test_sensorplugin.cpp b/tests/auto/qsensor/test_sensorplugin.cpp
index 6aa27d9..d4cd90b 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/qsensorgestureplugins/qsensorgestureplugins.pro b/tests/auto/qsensorgestureplugins/qsensorgestureplugins.pro
index de73fd0..2cc31a2 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
diff --git a/tests/auto/qsensorgestures_gestures/mockbackends.h b/tests/auto/qsensorgestures_gestures/mockbackends.h
index dfd5525..9417466 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;