diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-04 10:21:47 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-04 10:21:47 +0200 |
commit | 16f58282bc5a1f81f7346ac6560df68761ad277d (patch) | |
tree | 38cc24d17ea4d868ee3cffd8ca99e96ac08e76dd /src/declarative/scenegraph/coreapi/qsgnode.h | |
parent | 280242a5a14a99cc10857e35da61ac5b894d5f6b (diff) | |
parent | 1b7c1b6ef86d3d56ff01b2eab118062a229b0d19 (diff) |
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Diffstat (limited to 'src/declarative/scenegraph/coreapi/qsgnode.h')
-rw-r--r-- | src/declarative/scenegraph/coreapi/qsgnode.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/scenegraph/coreapi/qsgnode.h b/src/declarative/scenegraph/coreapi/qsgnode.h index fd2bc82b22..d6700af32e 100644 --- a/src/declarative/scenegraph/coreapi/qsgnode.h +++ b/src/declarative/scenegraph/coreapi/qsgnode.h @@ -99,7 +99,7 @@ public: // Lower 16 bites reserved for general node OwnedByParent = 0x0001, UsePreprocess = 0x0002, - ChildrenDoNotOverloap = 0x0004, + ChildrenDoNotOverlap = 0x0004, // Upper 16 bits reserved for node subclasses |