diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-22 13:16:59 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-22 13:16:59 +0100 |
| commit | 503eec194ea8bc70bfdbfd06bd0832a77cfcc137 (patch) | |
| tree | 6b32fb2c0d59f2efac71432fe3509af0aad2b8b0 /src/quick/items/qquickstateoperations_p.h | |
| parent | 99eac6e3fb53dc1ca6f8136a02f93c33be3ef52f (diff) | |
| parent | d815621963cee5571ed93fb89561c4884a685b6b (diff) | |
Merge "Merge branch 'dev' into stable" into refs/staging/stable
Diffstat (limited to 'src/quick/items/qquickstateoperations_p.h')
| -rw-r--r-- | src/quick/items/qquickstateoperations_p.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/quick/items/qquickstateoperations_p.h b/src/quick/items/qquickstateoperations_p.h index d43420f266..9ee0d591da 100644 --- a/src/quick/items/qquickstateoperations_p.h +++ b/src/quick/items/qquickstateoperations_p.h @@ -49,8 +49,6 @@ #include <QtQml/qqmlscriptstring.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickParentChangePrivate; @@ -213,7 +211,5 @@ QML_DECLARE_TYPE(QQuickParentChange) QML_DECLARE_TYPE(QQuickAnchorSet) QML_DECLARE_TYPE(QQuickAnchorChanges) -QT_END_HEADER - #endif // QQUICKSTATEOPERATIONS_P_H |