diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-04 09:26:33 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-04 09:26:33 (GMT) |
| commit | 95c0a8de7af1e631485117f5764f4e2677ec6d0b (patch) | |
| tree | 9f1fd8726b7f33a6958f3cf395c3ea1300c2d580 /demos/boxes/glbuffers.h | |
| parent | a800e1d5e7fa69a3bfa21d74c5db47f5a41ed65c (diff) | |
| parent | 397c3bb494e220af5ef1cf6e47cfdfc84b61540b (diff) | |
| download | Qt-95c0a8de7af1e631485117f5764f4e2677ec6d0b.zip Qt-95c0a8de7af1e631485117f5764f4e2677ec6d0b.tar.gz Qt-95c0a8de7af1e631485117f5764f4e2677ec6d0b.tar.bz2 | |
Merge commit 'mainline/master' into kinetic-declarativeui
Conflicts:
configure.exe
src/gui/math3d/qmatrix4x4.cpp
src/gui/math3d/qmatrix4x4.h
tools/qdoc3/htmlgenerator.cpp
Diffstat (limited to 'demos/boxes/glbuffers.h')
| -rw-r--r-- | demos/boxes/glbuffers.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/demos/boxes/glbuffers.h b/demos/boxes/glbuffers.h index 392924e..9e05fad 100644 --- a/demos/boxes/glbuffers.h +++ b/demos/boxes/glbuffers.h @@ -58,7 +58,9 @@ if (m_failed || !(assertion)) { returnStatement; \ } +QT_BEGIN_NAMESPACE class QMatrix4x4; +QT_END_NAMESPACE class GLTexture { |