diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-03-16 12:26:52 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-16 14:38:10 +0100 |
| commit | fb277cbdcff5cd30b9d3425797e406ef0b91c4ec (patch) | |
| tree | f4bb7e4611be617c251613d883ddea61dfcbbc17 | |
| parent | e4f98299079142fb0cacd1ee46c281da0c07300b (diff) | |
QtFeedback: Fix warnings about deprecated QtDeclarative headers.
Change-Id: I6260916387a92a69c31eaf7fdfd8d861e9a35514
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
| -rw-r--r-- | src/imports/feedback/plugin.cpp | 3 | ||||
| -rw-r--r-- | src/imports/feedback/qdeclarativefeedbackactuator_p.h | 2 | ||||
| -rw-r--r-- | src/imports/feedback/qdeclarativefeedbackeffect_p.h | 2 | ||||
| -rw-r--r-- | src/imports/feedback/qdeclarativefileeffect_p.h | 1 | ||||
| -rw-r--r-- | src/imports/feedback/qdeclarativehapticseffect_p.h | 1 | ||||
| -rw-r--r-- | src/imports/feedback/qdeclarativethemeeffect_p.h | 2 |
6 files changed, 4 insertions, 7 deletions
diff --git a/src/imports/feedback/plugin.cpp b/src/imports/feedback/plugin.cpp index 5175aca..29642f3 100644 --- a/src/imports/feedback/plugin.cpp +++ b/src/imports/feedback/plugin.cpp @@ -39,8 +39,7 @@ ** ****************************************************************************/ -#include <QtDeclarative/qdeclarativeextensionplugin.h> -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/QQmlExtensionPlugin> #include "qdeclarativehapticseffect_p.h" #include "qdeclarativefileeffect_p.h" diff --git a/src/imports/feedback/qdeclarativefeedbackactuator_p.h b/src/imports/feedback/qdeclarativefeedbackactuator_p.h index bf18608..17173bc 100644 --- a/src/imports/feedback/qdeclarativefeedbackactuator_p.h +++ b/src/imports/feedback/qdeclarativefeedbackactuator_p.h @@ -54,7 +54,7 @@ #ifndef QDECLARATIVEFEEDBACKACTUATOR_P_H #define QDECLARATIVEFEEDBACKACTUATOR_P_H -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include "qfeedbackactuator.h" QT_USE_NAMESPACE diff --git a/src/imports/feedback/qdeclarativefeedbackeffect_p.h b/src/imports/feedback/qdeclarativefeedbackeffect_p.h index a0e2673..3bb01d8 100644 --- a/src/imports/feedback/qdeclarativefeedbackeffect_p.h +++ b/src/imports/feedback/qdeclarativefeedbackeffect_p.h @@ -54,7 +54,7 @@ #ifndef QDECLARATIVEFEEDBACKEFFECT_P_H #define QDECLARATIVEFEEDBACKEFFECT_P_H -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include <qfeedbackeffect.h> QT_USE_NAMESPACE diff --git a/src/imports/feedback/qdeclarativefileeffect_p.h b/src/imports/feedback/qdeclarativefileeffect_p.h index fe25e3e..da6943d 100644 --- a/src/imports/feedback/qdeclarativefileeffect_p.h +++ b/src/imports/feedback/qdeclarativefileeffect_p.h @@ -54,7 +54,6 @@ #ifndef QDECLARATIVEFILEEFFECT_P_H #define QDECLARATIVEFILEEFFECT_P_H -#include <QtDeclarative/qdeclarative.h> #include "qdeclarativefeedbackeffect_p.h" QT_USE_NAMESPACE diff --git a/src/imports/feedback/qdeclarativehapticseffect_p.h b/src/imports/feedback/qdeclarativehapticseffect_p.h index 109aca9..8737c95 100644 --- a/src/imports/feedback/qdeclarativehapticseffect_p.h +++ b/src/imports/feedback/qdeclarativehapticseffect_p.h @@ -54,7 +54,6 @@ #ifndef QDECLARATIVEHAPTICSEFFECT_P_H #define QDECLARATIVEHAPTICSEFFECT_P_H -#include <QtDeclarative/qdeclarative.h> #include "qdeclarativefeedbackeffect_p.h" #include "qdeclarativefeedbackactuator_p.h" diff --git a/src/imports/feedback/qdeclarativethemeeffect_p.h b/src/imports/feedback/qdeclarativethemeeffect_p.h index 82df254..49cd3c2 100644 --- a/src/imports/feedback/qdeclarativethemeeffect_p.h +++ b/src/imports/feedback/qdeclarativethemeeffect_p.h @@ -54,7 +54,7 @@ #ifndef QDECLARATIVETHEMEEFFECT_P_H #define QDECLARATIVETHEMEEFFECT_P_H -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/qqml.h> #include <qfeedbackeffect.h> QT_USE_NAMESPACE |