diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-10-01 07:34:06 (GMT) |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-10-01 07:34:06 (GMT) |
commit | c198bdcf486e7b518aef44fdcb9834c9cae807a8 (patch) | |
tree | f6a830a040c9e8b6c205609d8f5d697430ccdc60 /src | |
parent | a2376870b03d694bcc5b614c8f949e497a11b95c (diff) | |
parent | f23ab31348bb6d3c6b7cb1ccf429ea932824e4e4 (diff) | |
download | Qt-c198bdcf486e7b518aef44fdcb9834c9cae807a8.zip Qt-c198bdcf486e7b518aef44fdcb9834c9cae807a8.tar.gz Qt-c198bdcf486e7b518aef44fdcb9834c9cae807a8.tar.bz2 |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src')
-rw-r--r-- | src/opengl/qgl_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 2e8ac88..a113b0f 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -399,7 +399,7 @@ public: Q_DECLARE_OPERATORS_FOR_FLAGS(QGLExtensions::Extensions) -class QGLShareRegister +class Q_AUTOTEST_EXPORT QGLShareRegister { public: QGLShareRegister() {} |