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/scenegraph/util/qsgtexturematerial.h | |
| parent | 99eac6e3fb53dc1ca6f8136a02f93c33be3ef52f (diff) | |
| parent | d815621963cee5571ed93fb89561c4884a685b6b (diff) | |
Merge "Merge branch 'dev' into stable" into refs/staging/stable
Diffstat (limited to 'src/quick/scenegraph/util/qsgtexturematerial.h')
| -rw-r--r-- | src/quick/scenegraph/util/qsgtexturematerial.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/quick/scenegraph/util/qsgtexturematerial.h b/src/quick/scenegraph/util/qsgtexturematerial.h index 822084b463..b842779716 100644 --- a/src/quick/scenegraph/util/qsgtexturematerial.h +++ b/src/quick/scenegraph/util/qsgtexturematerial.h @@ -39,14 +39,12 @@ ** ****************************************************************************/ -#ifndef TEXTUREMATERIAL_H -#define TEXTUREMATERIAL_H +#ifndef QSGTEXTUREMATERIAL_H +#define QSGTEXTUREMATERIAL_H #include <QtQuick/qsgmaterial.h> #include <QtQuick/qsgtexture.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGOpaqueTextureMaterial : public QSGMaterial @@ -94,6 +92,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - -#endif // TEXTUREMATERIAL_H +#endif |