diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-08 15:38:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-08 15:38:15 (GMT) |
| commit | 457d178fae492c81276ded4be9f861375eecb23b (patch) | |
| tree | a0e19fd57f9a7d5a4f1f5668f5bdda570f33c64f /doc | |
| parent | f6909d47b981720cb87cb96454cdf9ea493383ee (diff) | |
| parent | 5fe85b9d0e133734c7789fa9d1565684e15c5e2f (diff) | |
| download | Qt-457d178fae492c81276ded4be9f861375eecb23b.zip Qt-457d178fae492c81276ded4be9f861375eecb23b.tar.gz Qt-457d178fae492c81276ded4be9f861375eecb23b.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: (56 commits)
Fix compile when configure with no fontconfig support
Fix warning in qtextengine compilation
Reorder member varibles in QGlyphRunPrivate to eliminate warning
Revert 36e01e69
Fixed compile of tst_qscriptextensionplugin on some Windows configurations
Add function QGlyphRun::setRawData()
Correct antialias disabling logic for Core Text
Correct QStaticText tests after recent changes
Add missing license header.
Add basic static text drawing capability to lance
Fix Windows build
Refactor glyph pretransform check
Add the new 'glhypnotizer' demo.
Fix problem with cosmetic stroking of cubic beziers
Fix autotest to not depend on rasterization details
Still use midpoint rendering of aliased ellipses
Symbian build failure for Armv5
Fix the wayland windowsurface so that we have stencil and depth buffer
We need to let the currentContext be in the same state after
Track Wayland changes
...
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/demos/glhypnotizer.qdoc | 38 | ||||
| -rw-r--r-- | doc/src/images/glhypnotizer-demo.png | bin | 0 -> 46888 bytes |
2 files changed, 38 insertions, 0 deletions
diff --git a/doc/src/demos/glhypnotizer.qdoc b/doc/src/demos/glhypnotizer.qdoc new file mode 100644 index 0000000..97b3c3b --- /dev/null +++ b/doc/src/demos/glhypnotizer.qdoc @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Free Documentation License +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of this +** file. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example demos/glhypnotizer + \title GL Hypnotizer + + This demo shows how to use OpenGL from a seperate thread. + + \image glhypnotizer-demo.png + + New MDI windows can be added by pressing Ctrl-N and each new child + window renders in it's own thread. +*/ diff --git a/doc/src/images/glhypnotizer-demo.png b/doc/src/images/glhypnotizer-demo.png Binary files differnew file mode 100644 index 0000000..5b7a1ae --- /dev/null +++ b/doc/src/images/glhypnotizer-demo.png |
