diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 13:41:06 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 13:41:11 +0100 |
commit | e3de1d31fe05455f1f22085bb3607047d8ba718d (patch) | |
tree | ef7ea9ac0cdab88d953af7796e52c22a0e49b4c5 /src/sensors | |
parent | 5809a8b0ec112ced99d34c9670d097f1f0dc3171 (diff) | |
parent | 97cf3d27e6e9771690b1ea29e09f06d4376ffcab (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/sensors/generic/generictiltsensor.cpp
src/sensors/qtapsensor.h
sync.profile
Change-Id: I017a5fa8dffb69b41727495175c0fca9b76962e1
Diffstat (limited to 'src/sensors')
-rw-r--r-- | src/sensors/doc/snippets/sensors/plugin.cpp | 2 | ||||
-rw-r--r-- | src/sensors/gestures/qsensorgesture.h | 2 | ||||
-rw-r--r-- | src/sensors/gestures/qsensorgestureplugininterface.h | 2 | ||||
-rw-r--r-- | src/sensors/qorientationsensor.h | 2 | ||||
-rw-r--r-- | src/sensors/qsensorbackend.h | 10 | ||||
-rw-r--r-- | src/sensors/qsensormanager.cpp | 2 | ||||
-rw-r--r-- | src/sensors/qsensorplugin.h | 4 | ||||
-rw-r--r-- | src/sensors/qtapsensor.h | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/src/sensors/doc/snippets/sensors/plugin.cpp b/src/sensors/doc/snippets/sensors/plugin.cpp index e467128f..cad6378f 100644 --- a/src/sensors/doc/snippets/sensors/plugin.cpp +++ b/src/sensors/doc/snippets/sensors/plugin.cpp @@ -48,7 +48,7 @@ const char *MyBackend::id = "mybackend"; class MyPluginClass : public QObject, public QSensorPluginInterface, 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: void registerSensors() diff --git a/src/sensors/gestures/qsensorgesture.h b/src/sensors/gestures/qsensorgesture.h index 6c65120f..5ae7bb22 100644 --- a/src/sensors/gestures/qsensorgesture.h +++ b/src/sensors/gestures/qsensorgesture.h @@ -44,7 +44,7 @@ #include <QObject> #include <QStringList> -#include <qsensorsglobal.h> +#include <QtSensors/qsensorsglobal.h> #include <QList> #include <QMap> diff --git a/src/sensors/gestures/qsensorgestureplugininterface.h b/src/sensors/gestures/qsensorgestureplugininterface.h index ad50eacc..330d880c 100644 --- a/src/sensors/gestures/qsensorgestureplugininterface.h +++ b/src/sensors/gestures/qsensorgestureplugininterface.h @@ -62,7 +62,7 @@ public: virtual QString name() const = 0; }; -Q_DECLARE_INTERFACE(QSensorGesturePluginInterface, "org.qt-project.QSensorGesturePluginInterface"); +Q_DECLARE_INTERFACE(QSensorGesturePluginInterface, "org.qt-project.QSensorGesturePluginInterface") QT_END_NAMESPACE diff --git a/src/sensors/qorientationsensor.h b/src/sensors/qorientationsensor.h index fa508f32..082598fb 100644 --- a/src/sensors/qorientationsensor.h +++ b/src/sensors/qorientationsensor.h @@ -62,7 +62,7 @@ public: LeftUp, RightUp, FaceUp, - FaceDown, + FaceDown }; Orientation orientation() const; diff --git a/src/sensors/qsensorbackend.h b/src/sensors/qsensorbackend.h index feb05f07..4c6ce8b5 100644 --- a/src/sensors/qsensorbackend.h +++ b/src/sensors/qsensorbackend.h @@ -66,12 +66,12 @@ public: void setDescription(const QString &description); template <typename T> - T *setReading(T *reading) + T *setReading(T *readingClass) { - if (!reading) - reading = new T(this); - setReadings(reading, new T(this), new T(this)); - return reading; + if (!readingClass) + readingClass = new T(this); + setReadings(readingClass, new T(this), new T(this)); + return readingClass; } QSensorReading *reading() const; diff --git a/src/sensors/qsensormanager.cpp b/src/sensors/qsensormanager.cpp index b1b2e780..dbaf1ebb 100644 --- a/src/sensors/qsensormanager.cpp +++ b/src/sensors/qsensormanager.cpp @@ -68,7 +68,7 @@ public: QSensorManagerPrivate() : loadExternalPlugins(true) , pluginLoadingState(NotLoaded) - , loader(new QFactoryLoader("com.nokia.Qt.QSensorPluginInterface/1.0", QLatin1String("/sensors"))) + , loader(new QFactoryLoader("com.qt-project.Qt.QSensorPluginInterface/1.0", QLatin1String("/sensors"))) , defaultIdentifierForTypeLoaded(false) , sensorsChanged(false) { diff --git a/src/sensors/qsensorplugin.h b/src/sensors/qsensorplugin.h index 63f0ae20..336bce6b 100644 --- a/src/sensors/qsensorplugin.h +++ b/src/sensors/qsensorplugin.h @@ -64,8 +64,8 @@ protected: ~QSensorChangesInterface() {} }; -Q_DECLARE_INTERFACE(QSensorPluginInterface, "com.nokia.Qt.QSensorPluginInterface/1.0"); -Q_DECLARE_INTERFACE(QSensorChangesInterface, "com.nokia.Qt.QSensorChangesInterface/5.0"); +Q_DECLARE_INTERFACE(QSensorPluginInterface, "com.qt-project.Qt.QSensorPluginInterface/1.0") +Q_DECLARE_INTERFACE(QSensorChangesInterface, "com.qt-project.Qt.QSensorChangesInterface/5.0") QT_END_NAMESPACE diff --git a/src/sensors/qtapsensor.h b/src/sensors/qtapsensor.h index f44609b1..74ca40c2 100644 --- a/src/sensors/qtapsensor.h +++ b/src/sensors/qtapsensor.h @@ -108,7 +108,7 @@ Q_SIGNALS: private: Q_DECLARE_PRIVATE(QTapSensor); - Q_DISABLE_COPY(QTapSensor); + Q_DISABLE_COPY(QTapSensor) }; QT_END_NAMESPACE |