Merge remote-tracking branch 'origin/5.3' into 5.4v5.4.0-alpha1

Change-Id: I7c2b192d4b3b4d745096058fd69921d855433f85

2 files changed, 15 insertions, 4 deletions

diff --git a/src/sensors/gestures/qsensorgesturemanagerprivate_p.h b/src/sensors/gestures/qsensorgesturemanagerprivate_p.h
index fefabd5..abcadd3 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 b646d61..b896359 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) {