diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 09:13:42 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 09:14:33 +0100 |
| commit | d815621963cee5571ed93fb89561c4884a685b6b (patch) | |
| tree | 4c60b5f69eff56fd324e4203d006e1df677670ce /src/particles/qquickimageparticle_p.h | |
| parent | 9b25a6f39ee59fe1bb4352a5f2e4ef4a91f1f2c3 (diff) | |
| parent | 471645f6dba6a21b85cb6788f0a0a07b6d5a804a (diff) | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I6178a580b4c99aded1a69032a02169cff502b71d
Diffstat (limited to 'src/particles/qquickimageparticle_p.h')
| -rw-r--r-- | src/particles/qquickimageparticle_p.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/particles/qquickimageparticle_p.h b/src/particles/qquickimageparticle_p.h index 55bf3530f4..daa3d5cdbc 100644 --- a/src/particles/qquickimageparticle_p.h +++ b/src/particles/qquickimageparticle_p.h @@ -48,8 +48,6 @@ #include <QtQuick/qsgsimplematerial.h> #include <QtGui/qcolor.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class ImageMaterialData; @@ -442,5 +440,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // ULTRAPARTICLE_H |