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/quick/scenegraph/qsgdefaultglyphnode_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/quick/scenegraph/qsgdefaultglyphnode_p.h')
-rw-r--r-- | src/quick/scenegraph/qsgdefaultglyphnode_p.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.h b/src/quick/scenegraph/qsgdefaultglyphnode_p.h index 8f764b2d91..a3d5d7c3ae 100644 --- a/src/quick/scenegraph/qsgdefaultglyphnode_p.h +++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.h @@ -39,14 +39,12 @@ ** ****************************************************************************/ -#ifndef DEFAULT_GLYPHNODE_H -#define DEFAULT_GLYPHNODE_H +#ifndef QSGDEFAULTGLYPHNODE_P_H +#define QSGDEFAULTGLYPHNODE_P_H #include <private/qsgadaptationlayer_p.h> #include <QtQuick/qsgnode.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QGlyphs; @@ -80,6 +78,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - -#endif // DEFAULT_GLYPHNODE_H +#endif |