summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Gestures: Implement swipe gestureRichard Moe Gustavsen2009-08-271-3/+12
| | | | Note: if this fails building on any platform, talk to Denis!
* Mac: Fix Imageviewer example, and bugfix gesturesRichard Moe Gustavsen2009-08-272-249/+78
| | | | Rev-By: denis
* Cocoa: Implement single touch panRichard Moe Gustavsen2009-08-272-5/+6
|
* Make it compile on Windows CE where min and max are predefined macros.Jan-Arve Sæther2009-08-271-11/+11
| | | | Reviewed-by: mauricek
* Fixed the bubbles.svg file after fixing some bugs in the SVG renderer.Trond Kjernåsen2009-08-263-29/+29
| | | | Reviewed-by: Kim
* Made the opengl/overpainting example work with the GL 2 engine.Trond Kjernåsen2009-08-261-0/+5
| | | | | | | | | Since the GL 2 engine can't set/unset every single GL state that a user might possibly change, we have to make a rule that if something is changed from its default state, it needs to be reset before the GL 2 engine can draw correctly. Reviewed-by: Samuel
* Improved QPainter API for allowing native painting in GL / VG.Samuel Rødal2009-08-262-3/+5
| | | | | | | | Previously we were using QPaintEngine::syncState() which is not ideal naming-wise, since it actually prepares for native painting instead of syncing the painter's state to native state. Reviewed-by: Trond
* Added missing precision specifiers to custom shader effect.Samuel Rødal2009-08-261-1/+1
| | | | | | The precision specifiers need to be there on OpenGL ES 2.0. Reviewed-by: Tom
* Make the 'effects' examples compile when qreal == float.Jason Barron2009-08-262-2/+2
| | | | | | | | | All of the types supplied to qBound() must be the same and in the case where qreal is typedef'ed to a float, this is not the case because the outer 2 arguments are considered doubles. We explicitly cast them to qreal to guarantee they are all the same type. Reviewed-by: bnilsen
* Fixed documentation and use of incorrect entry point for custom shaders.Samuel Rødal2009-08-251-3/+1
| | | | | | | The entry point has been changed to be customShader, taking source image and texture coordinates as parameters. Reviewed-by: Tom
* Remove the 'script' sub-directory from the symbian scope.Jason Barron2009-08-251-1/+0
| | | | | | | | Now that QtScript is an optional module there is a chance that it is not built so don't try to explicitly force it to compile these examples. Reviewed-by: Aleksandar Babic
* Integrate QAbstractVideoSurface API.Andrew den Exter2009-08-2416-1/+1377
| | | | | | | | | | This introduces a QAbstractVideoSurface interface for implementing arbitrary video outputs, and a QVideoFrame type. Also included is the QVideoSurfaceFormat class which is used to configure the input to a video surface, and the QAbstractVideoBuffer class which allows QVideoFrames to be constructed from non-native frame types. Reviewed-by: Dmytro Poplavskiy
* Examples: Warn about usage of QHttpMarkus Goetz2009-08-243-0/+3
| | | | | | | This is an intermediate solution until the examples have been ported to using QNetworkAccessManager. Reviewed-by: TrustMe
* Fix double to float truncation warning.Alessandro Portale2009-08-241-1/+1
|
* Make context2d compile with QT_NO_SCRIPTTOOLS.Jason Barron2009-08-241-2/+4
| | | | | | These two member variables should be ifdef'ed. Reviewed-by: Kent Hansen
* Fix warning about unreferenced element.Alessandro Portale2009-08-211-3/+1
| | | | StationQuery::query is static. No need for StationQuery instance.
* Fix warning about unreferenced element.Alessandro Portale2009-08-211-2/+1
| | | | TimeQuery::query is static. No need for TimeQuery instance.
* Fix double to float truncation warning.Alessandro Portale2009-08-211-1/+1
|
* Add missing license headers and header guards.Jason McDonald2009-08-211-0/+41
| | | | Reviewed-by: Trust Me
* Fix obsolete license headers.Jason McDonald2009-08-2117-34/+34
| | | | Reviewed-by: Trust Me
* renamed examplebase.pri to symbianpkgrules.priEspen Riskedal2009-08-21241-326/+357
| | | | | | | | examplesbase.pri sounded to generic and it was not obvious that this was only for Symbian. Also merged the different symbian rules if they were spread around in the .pro file. Reviewed-by: Aleksandar Sasha Babic
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-2144-0/+1401
|\ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h
| * Only compile shader effect example when having OpenGL.Bjørn Erik Nilsen2009-08-212-3/+3
| |
| * Move shader effect example from examples/graphicsview to examples/effectsBjørn Erik Nilsen2009-08-2120-4/+10
| |
| * Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-218-30/+158
| |\ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/graphicsview.pri
| * | Use pixmap filter for the drop shadow effect.Bjørn Erik Nilsen2009-08-212-2/+5
| | |
| * | Merge commit 'qt/master-stable' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-207-80/+76
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene.cpp
| * | | Rename QGraphicsShadowEffect to QGraphicsDropShadowEffect.Bjørn Erik Nilsen2009-08-202-4/+4
| | | | | | | | | | | | | | | | Discussed with Andreas.
| * | | Move examples/graphicsview/blurpicker|lighting to examples/effects.Bjørn Erik Nilsen2009-08-1926-6/+17
| | | |
| * | | Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-192-69/+38
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
| * \ \ \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-171078-1137/+1137
| |\ \ \ \
| * \ \ \ \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-07134-8386/+2251
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/graphicsview.pri src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp tests/auto/auto.pro
| * | | | | | Infinite recursion in examples/graphicsview/customshaderBjørn Erik Nilsen2009-07-311-1/+1
| | | | | | |
| * | | | | | Compile examples/graphicsview/customshader.Bjørn Erik Nilsen2009-07-312-5/+5
| | | | | | |
| * | | | | | Merge branch 'kinetic-graphicseffect' of ↵Bjørn Erik Nilsen2009-07-2926-334/+457
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into graphicseffects Conflicts: src/gui/graphicsview/qgraphicseffect.cpp src/gui/graphicsview/qgraphicseffect_p.h
| | * | | | | | Update QGraphicsShaderEffect to match new APIRhys Weatherley2009-07-246-28/+22
| | | | | | | |
| | * | | | | | Merge branch 'kinetic-graphicseffect' of ↵Rhys Weatherley2009-07-248-42/+32
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-graphicseffect
| | * | | | | | | Implement a variant on blurpicker that shows a custom shader.Rhys Weatherley2009-07-2410-0/+569
| | | | | | | | |
| | * | | | | | | Merge branch 'custom_shaders' of ../qt-graphics-team into custom-shadersRhys Weatherley2009-07-2319-474/+34
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
| * | | | | | | | | QGraphicsEffect cleanup.Bjørn Erik Nilsen2009-07-292-107/+2
| | | | | | | | | |
| * | | | | | | | | Make examples/graphicsview/lightning compatible the new effects API.Bjørn Erik Nilsen2009-07-292-6/+6
| | | | | | | | | |
| * | | | | | | | | Add QGraphicsEffectSource::pixmap.Bjørn Erik Nilsen2009-07-292-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need a convenient way of getting the pixmap representation of the source.
| * | | | | | | | | Add QGraphicsSourceEffect.Bjørn Erik Nilsen2009-07-292-2/+107
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Make QGraphicsEffect independent of QGraphicsItem.Bjørn Erik Nilsen2009-07-246-35/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to basically implement support for graphics effects on pretty much everything, e.g. QWidget. We currently only support effects on QGraphicsItem, but there's more to come :-)
| * | | | | | | | QGraphicsEffect API cleanup.Bjørn Erik Nilsen2009-07-238-14/+8
| |/ / / / / / /
| * | | | | | | Merge commit 'qt/master' into graphicseffectsBjørn Erik Nilsen2009-07-21122-14524/+869
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/graphicsview.pri src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicsscene.h src/gui/graphicsview/qgraphicsview.cpp
| * \ \ \ \ \ \ \ Merge commit 'master/master' into kinetic-graphicseffectAriya Hidayat2009-06-301-4/+32
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit 'master/master' into kinetic-graphicseffectAriya Hidayat2009-06-291190-2258/+19324
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/graphicsview.pri src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicsview.cpp
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Ariya Hidayat2009-06-053-3/+7
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-graphicseffect
| * | | | | | | | | | | Remove unused code in the blurpicker example.Ariya Hidayat2009-06-042-15/+0
| | | | | | | | | | | |