diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-13 13:10:58 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-13 13:10:58 +0100 |
commit | e608b695cc183c9076a0ee3883d392990c023e02 (patch) | |
tree | 1bd958e245d324758b522f615336627d81269276 /src | |
parent | 007772e642fc337a97e50f65babb62c520257476 (diff) | |
parent | 4ff25ba156323d9b82e7cddf16eebcb744d0e0ca (diff) | |
download | qtsensors-e608b695cc183c9076a0ee3883d392990c023e02.tar.gz |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I7db3f66a1ac98d32a206c288b53151ad0a249944
Diffstat (limited to 'src')
-rw-r--r-- | src/sensors/gestures/qsensorgesture.h | 10 | ||||
-rw-r--r-- | src/sensors/gestures/qsensorgesturemanager.h | 4 | ||||
-rw-r--r-- | src/sensors/gestures/qsensorgestureplugininterface.h | 4 | ||||
-rw-r--r-- | src/sensors/gestures/qsensorgesturerecognizer.h | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/sensors/gestures/qsensorgesture.h b/src/sensors/gestures/qsensorgesture.h index e8e1853..7e8b806 100644 --- a/src/sensors/gestures/qsensorgesture.h +++ b/src/sensors/gestures/qsensorgesture.h @@ -34,13 +34,13 @@ #ifndef QSENSORGESTURE_H #define QSENSORGESTURE_H -#include <QObject> -#include <QStringList> +#include <QtCore/QObject> +#include <QtCore/QStringList> #include <QtSensors/qsensorsglobal.h> -#include <QList> -#include <QMap> -#include <QVector> +#include <QtCore/QList> +#include <QtCore/QMap> +#include <QtCore/QVector> #include <QtCore/qmetatype.h> diff --git a/src/sensors/gestures/qsensorgesturemanager.h b/src/sensors/gestures/qsensorgesturemanager.h index 55296be..1a948c6 100644 --- a/src/sensors/gestures/qsensorgesturemanager.h +++ b/src/sensors/gestures/qsensorgesturemanager.h @@ -34,8 +34,8 @@ #ifndef QSENSORGESTUREMANAGER_P_H #define QSENSORGESTUREMANAGER_P_H -#include <QObject> -#include <QStringList> +#include <QtCore/QObject> +#include <QtCore/QStringList> #include <QtSensors/qsensorgesture.h> #include <QtSensors/qsensorgesturerecognizer.h> diff --git a/src/sensors/gestures/qsensorgestureplugininterface.h b/src/sensors/gestures/qsensorgestureplugininterface.h index 3fb3bc9..cd58a90 100644 --- a/src/sensors/gestures/qsensorgestureplugininterface.h +++ b/src/sensors/gestures/qsensorgestureplugininterface.h @@ -34,8 +34,8 @@ #ifndef QSENSORGESTUREPLUGININTERFACE_H #define QSENSORGESTUREPLUGININTERFACE_H -#include <QObject> -#include <QtGlobal> +#include <QtCore/QObject> +#include <QtCore/QtGlobal> #include <QtCore/qplugin.h> #include <QtSensors/qsensorgesture.h> #include <QtSensors/qsensorgesturerecognizer.h> diff --git a/src/sensors/gestures/qsensorgesturerecognizer.h b/src/sensors/gestures/qsensorgesturerecognizer.h index d9532f5..1c4cd17 100644 --- a/src/sensors/gestures/qsensorgesturerecognizer.h +++ b/src/sensors/gestures/qsensorgesturerecognizer.h @@ -34,9 +34,9 @@ #ifndef QSENSORGESTURERECOGNIZER_H #define QSENSORGESTURERECOGNIZER_H -#include <QDebug> -#include <QTimer> -#include <QStringList> +#include <QtCore/QDebug> +#include <QtCore/QTimer> +#include <QtCore/QStringList> #include <QtSensors/qsensorgesture.h> |