summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | 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
| | | | | | | | | | | | |
| * | | | | | | | | | | | 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)
* | | | | | | | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-213-1/+124
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/graphicsview/graphicsview.pro
| * | | | | | | | | | | | | Merge branch 'anchorlayout' of ↵Jan-Arve Sæther2009-08-213-1/+124
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@gitorious.org:+openbossa-developers/qt/openbossa-clone Conflicts: src/gui/graphicsview/graphicsview.pri
| | * | | | | | | | | | | | | Remove the anchorlayoyt example that can load layouts.Jan-Arve Sæther2009-08-2014-1759/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We decided to remove it because it does not serve its purpose as an example.(Too much code, does not show how to use the API in a nice way)
| | * | | | | | | | | | | | | update API to what was agreed on the API review meeting yesterday:Jan-Arve Sæther2009-08-193-49/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes are: * Move enums in QGraphicsAnchorLayout::Edge to Qt::AnchorPoint. Prefix them with Anchor since they are not edges in general. * Rename anchor() to addAnchor() * Rename anchorCorner() -> addCornerAnchors() * Rename anchorWidth() -> addLeftAndRightAnchors() * Rename anchorHeight() -> addTopAndBottomAnchors() * Rename anchorGeometry() -> addAllAnchors() * remove the overloads that take a spacing argument, and add setAnchorSpacing() to accommodate for that. * Added anchorSpacing() (implementation missing) * Added unsetAnchorSpacing(). (implementation missing) * made sizeHint() protected. Updated all examples and autotest to reflect this API change.
| | * | | | | | | | | | | | | Clean up exampleJan-Arve Sæther2009-08-172-151/+6
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Clean up public API: move dumpGraph() to private API.Jan-Arve Sæther2009-08-171-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully we won't need it more...
| | * | | | | | | | | | | | | Make sure that internal center anchors are not simplified.Jan-Arve Sæther2009-07-221-0/+57
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Can now specify which layout to load on the command line.Jan-Arve Sæther2009-07-223-4/+10
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Explicitly use a spacing of 0 in order to keep old behaviour.Jan-Arve Sæther2009-07-221-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This broke after commit 0872f78d8924b9bea8b8da6618e24cd7d06c5d7d that fixed the default spacings.
| | * | | | | | | | | | | | | Use whitespaces and newlines when saving the xml file.Jan-Arve Sæther2009-07-221-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some whitespace cleanup.
| | * | | | | | | | | | | | | Added the possibility to save a layout.Jan-Arve Sæther2009-07-223-34/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep it simple...
| | * | | | | | | | | | | | | Add an exampleJan-Arve Sæther2009-07-2213-0/+1645
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should hopefully be easier to test layouts now...
| | * | | | | | | | | | | | | QGraphicsAnchorLayoutExample: Delete objects to avoid memory leaksEduardo M. Fleury2009-07-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete objects from heap.
| | * | | | | | | | | | | | | QGraphicsAnchorLayout: Adding an usage exampleJesus Sanchez-Palencia2009-07-224-1/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
* | | | | | | | | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-214-16/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/examples.pro qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/qmake.pro src/script/api/qscriptable.h src/script/api/qscriptclasspropertyiterator.h src/script/api/qscriptcontext.h src/script/api/qscriptengineagent.cpp src/script/api/qscriptstring.cpp src/script/api/qscriptstring.h src/script/api/qscriptvalueiterator.cpp src/script/api/qscriptvalueiterator.h src/script/qscriptclass.cpp src/script/qscriptcontext.cpp src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptvalue.cpp src/script/qscriptvalue_p.h src/script/qscriptvalueimplfwd_p.h src/script/script.pro src/src.pro tests/auto/auto.pro tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp tools/configure/configureapp.cpp
| * | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-201-13/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtscript-jsc-backend Conflicts: src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
| * | | | | | | | | | | | | | | only create and attach the script debugger if it's actually requestedKent Hansen2009-08-201-11/+16
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-207-80/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtscript-jsc-backend
| * | | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-192-69/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtscript-jsc-backend