summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Doc: Integrated the Rogue (state machine) example.Geir Vattekar2009-08-076-0/+465
| | | | | | | | Reviewed-by: Kent Hansen
| * implement name() function of custom property iteratorKent Hansen2009-08-061-1/+1
| |
| * make the calculator example use only standard JSKent Hansen2009-08-061-45/+62
| | | | | | | | __qt_sender__ is evil. Gah.
| * Fixed compilation of the gestures/imagewidget example.Denis Dzyubenko2009-08-063-12/+35
| | | | | | | | | | | | | | Also improved an example a bit to optionally support TapAndHold gesture with plain mouse events. Reviewed-by: trustme
| * Added example that uses WebKit to capture Web page frames.Andre Pedralho2009-08-064-0/+278
| | | | | | | | | | | | | | | | | | | | The framecapture is based on GraphicsDojo/WebCapture and shows how to use WebKit toolkit to capture a web page and save its internal frames in different image files using the new property QWebFrame::clipRenderToViewPort. Merge-request: 1103 Reviewed-by: Ariya Hidayat <ariya.hidayat@nokia.com>
| * Merge AudioServices into mainline.Justin McPherson2009-08-0517-0/+1772
| |
| * Merge branch '4.5'Bill King2009-08-052-2/+0
| |\ | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | * Fix obsolete license headersJason McDonald2009-08-043-8/+6
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Added the license header to the example.Denis Dzyubenko2009-08-042-0/+82
| | |
| * | Removed the QTapAndHoldGestureDenis Dzyubenko2009-08-045-8/+151
| | | | | | | | | | | | | | | | | | | | | | | | Moved the gesture implementation to the imageviewer example as it cannot be fully implemented in a crossplatform way - for example on Windows tap and hold is a system gesture that is transparent to the application. Reviewed-by: trustme
| * | Modify imagewidget example so it works with new APIRichard Moe Gustavsen2009-08-041-31/+15
| | |
| * | Merge branch '4.5'Thiago Macieira2009-08-031-1/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qsharedpointer.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/dialogs/qcolordialog.cpp src/gui/painting/qwindowsurface_raster.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qsharedpointer/externaltests.cpp
| | * Musicplayer example crashes when trying to open unvalid fileRichard Moe Gustavsen2009-07-241-1/+4
| | | | | | | | | | | | | | | | | | | | | Reason: Example tries to get media from QList with an index out of bounds. Nothing to do with Phonon. Task-number: 253307
| * | remove constructors that are not usefulKent Hansen2009-08-031-2/+4
| | | | | | | | | | | | | | | | | | | | | The constructors that take a list of target states produce hard-to-read code, and they're rarely useful in practice since 99% of transitions take a single target state; so it's better to enforce that setTarget{State,States}() be used instead.
| * | Doc: Use new APIs in example and correct documentation regarding replacement.Volker Hilsheimer2009-07-311-2/+2
| | |
| * | Show open directory dialog for new gesture exampleRichard Moe Gustavsen2009-07-311-0/+3
| | | | | | | | | | | | RevBy: denis
| * | fix two bugs in the custom script class exampleKent Hansen2009-07-302-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | 1) fromScriptValue() needs to call qvariant_cast() on the data, in order to be symmetric with toScriptValue(). 2) use the overload of newFunction() that takes a prototype object, so that the prototype.constructor and constructor.prototype relationship is set up correctly; otherwise the instanceof operator won't work.
| * | Fix compilation errors in examples and demos on VxWorks and QNX.Robert Griebl2009-07-296-6/+11
| | | | | | | | | | | | Reviewed-by: Harald Fernengel
| * | Move sub-attaq from examples to demos because sub-attaq is a bitAlexis Menard2009-07-2872-6521/+0
| | | | | | | | | | | | too "advanced".
| * | Remove tank game exampleEskil Abrahamsen Blomfeldt2009-07-2827-2396/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | After discussions with product management, it was considered best that this example be removed until it can be improved. There are some bugs an irregularities that should be cleaned up, and the theme should be made less violent. Reviewed-by: Volker Hilsheimer
| * | Remove the close shortcut from the example since QMdiArea provides thisAndy Shaw2009-07-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since QMdiArea provides this already via the standard keys, then we don't want to add it ourselves otherwise it triggers an ambigious shortcut on the platforms which already has CTRL+F4. Task-number: 161999 Reviewed-by: Kavindra Palaraja
* | | 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
| | * | | Make QStateMachine inherit QStateKent Hansen2009-07-2212-37/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for a "root state" in the machine; or rather, the machine _is_ the root state. User code can now pass in a QStateMachine directly to the QState constructor, instead of machine->rootState(). This also means we could get rid of the "proxying" from the machine to the root state for things like properties (initialState et al), finished() signal and auto-reparenting of states (the ChildAdded event hack). A fun little side-effect of this change is that it's now possible to embed state machines within state machines. We can't think of a good use case yet where you would rather embed a stand-alone state machine (with its own event processing etc.) rather than having just a regular nested state, but it's neat and it works. Reviewed-by: Eskil Abrahamsen Blomfeldt
| | * | | Remove Stickman editorEskil Abrahamsen Blomfeldt2009-07-217-437/+0
| | | | | | | | | | | | | | | | | | | | | | | | | The editor was a just a detail to make the animations and shouldn't be included in the example.
* | | | | 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 'origin/4.5'Oswald Buddenhagen2009-07-201-1/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp src/3rdparty/webkit/WebCore/page/DOMWindow.idl src/corelib/io/qdiriterator.cpp src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h tests/auto/qxmlquery/tst_qxmlquery.cpp tools/linguist/lconvert/main.cpp
| | * Update the example TrafficInfo for GCC 3.3Benjamin Poulain2009-07-171-1/+3
| | | | | | | | | | | | | | | | | | | | | The example TrafficInfo did not compile on GCC 3.3 due to a bug in the parser of GCC. Task-number: 258208
| * | Add the "star" example, which demonstrates how to mix OpenVG and QPainterRhys Weatherley2009-07-207-0/+290
| | | | | | | | | | | | Reviewed-by: trustme
| * | Update the documentation after the change in the completer exempleOlivier Goffart2009-07-171-2/+2
| | |
| * | Lets the size of the completer be configurable in a way similar to QComboBox.Frédéric Mercille2009-07-172-4/+23
| | | | | | | | | | | | | | | Merge-request: 884 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| * | Doc: show warnings about unrecognized or unsupported devices in the statusVolker Hilsheimer2009-07-161-8/+25
| | | | | | | | | | | | | | | | | | | | | bar where TabletPC users can also see them. Fixes: task 216859 Rev-by: TrustMe
| * | And again in the examplesThiago Macieira2009-07-163-3/+3
| | |
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtPeter Hartmann2009-07-1510-22/+19
| |\ \
| | * | Make the mainwindow examples use setWindowFilePathNorwegian Rock Cat2009-07-146-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should have done this a while ago. Use setWindowFilePath to get proxy icons on mac and simplify window title handling on the other platforms. The only downside is that we do have to specify the application name to get the exact same behavior. But on the other hand, QSettings handlig is a bit better.
| | * | make examples/activeqt/webbrowser work on Windows CEJoerg Bornemann2009-07-133-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This example only worked on desktop Windows and Windows mobile. Windows CE uses the same GUID for the Internet Explorer ActiveX control like desktop Windows. Task-number: 255111 Reviewed-by: thartman
| | * | general wording change for some file type namesFrederik Schwarzer2009-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - .ts file -> TS file - .qm file -> QM file - .ui file -> UI file + a handfull of typos I stumbled over Merge-request: 802 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | Merge branch 'master' of git://gitorious.org/qt/qtTobias Koenig2009-07-051113-2201/+4732
| |\ \ \ | | |/ /