summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-08-28 16:18:56 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-08-28 16:18:56 +0200
commit881915309098e6bfe0f2577a72eaf9b7f3fdfa8e (patch)
tree26e615d44f40fc5d87b9525be62189dbb530d7e9
parentcea9f48beb46b530fd669f8686ee4a77bfb1738e (diff)
parentf33363d292484f0fe62b177df0fd8080910d01f9 (diff)
Merge remote-tracking branch 'origin/5.3' into 5.4v5.4.0-alpha1
-rw-r--r--dist/changes-5.3.144
-rw-r--r--dist/changes-5.3.241
-rw-r--r--src/sensors/gestures/qsensorgesturemanagerprivate_p.h11
-rw-r--r--src/sensors/qsensormanager.cpp8
-rw-r--r--tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h11
5 files changed, 111 insertions, 4 deletions
diff --git a/dist/changes-5.3.1 b/dist/changes-5.3.1
new file mode 100644
index 00000000..e1e8dfc3
--- /dev/null
+++ b/dist/changes-5.3.1
@@ -0,0 +1,44 @@
+Qt 5.3.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.3.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+ http://qt-project.org/doc/qt-5.3
+
+The Qt version 5.3 series is binary compatible with the 5.2.x series.
+Applications compiled for 5.2 will continue to run with 5.3.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Library *
+****************************************************************************
+
+QtSensors
+---------
+
+ - [QTBUG-38224] Fixed usage of wrong directory separator by some sensor
+ examples.
+
+****************************************************************************
+* Platform Specific Changes *
+****************************************************************************
+
+Android
+-------
+
+ - [QTBUG-39335] Fixed crash when accelerationMode was set to Gravity
+
+Windows
+-------
+
+ - [QTBUG-39698] Fixed crash when trying to access the sensors on a desktop
+ rather than mobile platforms.
+
diff --git a/dist/changes-5.3.2 b/dist/changes-5.3.2
new file mode 100644
index 00000000..17f6d711
--- /dev/null
+++ b/dist/changes-5.3.2
@@ -0,0 +1,41 @@
+Qt 5.3.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.3.0 and Qt 5.3.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+ http://qt-project.org/doc/qt-5.3
+
+The Qt version 5.3 series is binary compatible with the 5.2.x series.
+Applications compiled for 5.2 will continue to run with 5.3.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Library *
+****************************************************************************
+
+QtSensors
+---------
+
+ - QCompass documentation improved.
+
+****************************************************************************
+* Platform Specific Changes *
+****************************************************************************
+
+Linux
+-----
+
+ - [sensorfw] Fixed incomplete initialization after restarting sensord.
+ - [sensorfw] Improved debugging and tracing capabilities
+ - [sensorfw] Added more checks to be more tolerant in case of errors or
+ corner cases.
+ - [sensorfw] Minor code cleanups
+
diff --git a/src/sensors/gestures/qsensorgesturemanagerprivate_p.h b/src/sensors/gestures/qsensorgesturemanagerprivate_p.h
index fefabd59..abcadd36 100644
--- a/src/sensors/gestures/qsensorgesturemanagerprivate_p.h
+++ b/src/sensors/gestures/qsensorgesturemanagerprivate_p.h
@@ -34,6 +34,17 @@
#ifndef QSENSORGESTUREMANAGERPRIVATE_P_H
#define QSENSORGESTUREMANAGERPRIVATE_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 <QObject>
#include <QMap>
#include <QStringList>
diff --git a/src/sensors/qsensormanager.cpp b/src/sensors/qsensormanager.cpp
index b646d619..b896359a 100644
--- a/src/sensors/qsensormanager.cpp
+++ b/src/sensors/qsensormanager.cpp
@@ -97,7 +97,7 @@ public:
#endif
qCDebug(sensorsCategory) << "Loading config from" << config;
if (!QFile::exists(config)) {
- qCWarning(sensorsCategory) << "There is no config file" << config;
+ qCDebug(sensorsCategory) << "There is no config file" << config;
return;
}
QFile cfgfile(config);
@@ -168,7 +168,7 @@ public Q_SLOTS:
Q_GLOBAL_STATIC(QSensorManagerPrivate, sensorManagerPrivate)
-static void initPlugin(QObject *o)
+static void initPlugin(QObject *o, bool warnOnFail = true)
{
qCDebug(sensorsCategory) << "Init plugin" << o;
if (!o) {
@@ -194,7 +194,7 @@ static void initPlugin(QObject *o)
qCDebug(sensorsCategory) << "Register sensors for " << plugin;
d->seenPlugins.insert(o);
plugin->registerSensors();
- } else {
+ } else if (warnOnFail) {
qCWarning(sensorsCategory) << "Can't cast to plugin" << o;
}
}
@@ -208,7 +208,7 @@ void QSensorManagerPrivate::loadPlugins()
SENSORLOG() << "initializing static plugins";
// Qt-style static plugins
Q_FOREACH (QObject *plugin, QPluginLoader::staticInstances()) {
- initPlugin(plugin);
+ initPlugin(plugin, false/*do not warn on fail*/);
}
if (d->loadExternalPlugins) {
diff --git a/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h b/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h
index d7e5842c..cca9a6a9 100644
--- a/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h
+++ b/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h
@@ -34,6 +34,17 @@
#ifndef QTESTSENSORGESTUREPLUGIN_P_H
#define QTESTSENSORGESTUREPLUGIN_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 <QObject>
#include <qsensorgestureplugininterface.h>