diff options
author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-02-25 17:22:58 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-26 17:40:21 +0100 |
commit | c324edd5923a86548e385fa6f16361e1f085e4c4 (patch) | |
tree | fe92a7e9933d681fd2abb6b86c63f2b5ad7a6946 /src/quick/scenegraph/util/qsgtexturematerial.h | |
parent | 98e00abc19ad46072f7c8303e50f9748d36a925e (diff) |
Avoid ambiguous include guards in SG classes
These include guards stem from the olden days before the QSG
prefix and many of them are conflict prone, which can lead
to pretty bisarrer errors for the user.
Change-Id: I0e76c68a588404b6e82be9ecc2e7afa3b9a48e78
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/quick/scenegraph/util/qsgtexturematerial.h')
-rw-r--r-- | src/quick/scenegraph/util/qsgtexturematerial.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/scenegraph/util/qsgtexturematerial.h b/src/quick/scenegraph/util/qsgtexturematerial.h index cbc4f7d51f..ee4f7cc2e4 100644 --- a/src/quick/scenegraph/util/qsgtexturematerial.h +++ b/src/quick/scenegraph/util/qsgtexturematerial.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef TEXTUREMATERIAL_H -#define TEXTUREMATERIAL_H +#ifndef QSGTEXTUREMATERIAL_H +#define QSGTEXTUREMATERIAL_H #include <QtQuick/qsgmaterial.h> #include <QtQuick/qsgtexture.h> @@ -92,4 +92,4 @@ public: QT_END_NAMESPACE -#endif // TEXTUREMATERIAL_H +#endif |