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/gestures | |
| 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/gestures')
| -rw-r--r-- | src/sensors/gestures/qsensorgesture.h | 2 | ||||
| -rw-r--r-- | src/sensors/gestures/qsensorgestureplugininterface.h | 2 |
2 files changed, 2 insertions, 2 deletions
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 |