summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* 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-2516-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-221-3/+1
| | | | StationQuery::query is static. No need for StationQuery instance.
* Fix warning about unreferenced element.Alessandro Portale2009-08-221-2/+1
| | | | TimeQuery::query is static. No need for TimeQuery instance.
* Fix double to float truncation warning.Alessandro Portale2009-08-221-1/+1
|
* Add missing license headers and header guards.Jason McDonald2009-08-221-0/+41
| | | | Reviewed-by: Trust Me
* Fix obsolete license headers.Jason McDonald2009-08-2217-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-2419-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-248-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
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Ariya Hidayat2009-06-046-29/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-graphicseffect
| * | | | | | | | | | | | Source files for the blur picker example.Ariya Hidayat2009-06-037-0/+440
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should be in 295c3927eb236483e6fd2e59f7588f35baa75ea2, but I forgot them.
| * | | | | | | | | | | | Simplify the examples, since effect is a QObject now.Ariya Hidayat2009-06-034-10/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Another QGraphicsEffect example: application chooser with blur effect.Ariya Hidayat2009-06-0211-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use left and right arrow to rotate the icons wheel. The blur effect is applied to each icon, the farthest icon becomes the most blurry one.
| * | | | | | | | | | | | First example using QGraphicsEffect class: drop shadows on items.Ariya Hidayat2009-06-027-0/+403
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The shadow is casted from a moving light source. The shadow offset for each item is different, depending on the relative position of the item to the light source. The same goes for the shadow opacity.
* | | | | | | | | | | | | Remove changes from bad merge.Jason Barron2009-08-211-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was related to e93ffdbb6fde611defc34fd27aec25c40da5a60e. Again, this most likely happened when switching between 4.5 and 4.6 and resolving some conflict incorrectly.
* | | | | | | | | | | | | Remove commented-out code from examples.axis2009-08-211-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
* | | | | | | | | | | | | Removed an example that was listed twice.axis2009-08-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Espen Riskedal
* | | | | | | | | | | | | Fixes: Missing deployment of backends for phonon examplesaxis2009-08-212-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Joerg Details: deployment of waveout and direct show backend Conflicts: examples/phonon/capabilities/capabilities.pro examples/phonon/musicplayer/musicplayer.pro (Cherry-pick of d6cfcd22472128cc68c75a7e24791a909082732f)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 15:23:07 +0000