summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-07-3129-62/+76
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-3121-53/+55
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Rename Rect.pen to Rect.borderMichael Brasser2009-07-3112-17/+17
| | |
| | * Rename centeredIn to centerIn.Michael Brasser2009-07-319-11/+11
| | |
| | * Introduce Loader item.Michael Brasser2009-07-307-25/+27
| | | | | | | | | | | | | | | The Loader item takes the qml/qmlItem functionality from Item and moves it to a specialized subclass.
| * | Merge branch 'master' of ../../qt into kinetic-declarativeuiAaron Kennedy2009-07-312-3/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/kernel.pri src/corelib/kernel/qabstractitemmodel.cpp src/corelib/kernel/qmetaobject.cpp src/corelib/kernel/qmetaobject.h
| | * | 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.
| * | | Merge branch 'master' of ../qt into kinetic-declarativeuiAaron Kennedy2009-07-306-6/+11
| |\ \ \ | | |/ / | | | / | | |/ | |/| Conflicts: src/gui/widgets/qlinecontrol_p.h
| | * Fix compilation errors in examples and demos on VxWorks and QNX.Robert Griebl2009-07-296-6/+11
| | | | | | | | | | | | Reviewed-by: Harald Fernengel
* | | Add an example using FontFamily.Yann Bodson2009-07-312-0/+66
|/ /
* | fix all examples after change to QGraphicsTransform::origin.Lars Knoll2009-07-293-7/+7
| |
* | fixes in examples and demosLars Knoll2009-07-292-8/+9
| | | | | | | | | | Fixed all examples and demos to work after the changes to Flipable and Rotation3D.
* | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-293-3/+128
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-292-2/+3
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Add mass property to follow.Martin Jones2009-07-291-2/+10
| | | |
| * | | loader improvements.Martin Jones2009-07-292-1/+118
| | | |
* | | | Merge branch 'master' of ../qt into kinetic-declarativeuiAaron Kennedy2009-07-29100-8918/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/widgets/qlineedit.cpp
| * | 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
* | | Fix for QmlPaletteYann Bodson2009-07-282-2/+3
| |/ |/| | | | | | | Add a colorGroup property and remove palette properties from the root context.
* | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-07-23184-381/+1114
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Doc and example fixes for library qualification (QT-558)Warwick Allison2009-07-2320-29/+29
| | |
| * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-2344-352/+845
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-07-2344-352/+845
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe src/gui/kernel/qaction.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.
| | | * 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
| | | |\ \
| | | * \ \ Merge branch 'master' of git://gitorious.org/qt/qtTobias Koenig2009-07-051113-2201/+4732
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' of git://gitorious.org/qt/qtTobias Koenig2009-06-1611-53/+32
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' of git://gitorious.org/qt/qtTobias Koenig2009-06-1015-59/+37
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge commit 'qt-mainline/master'Tobias Koenig2009-06-04220-359/+14115
| | | |\ \ \ \ \ \
| | | * | | | | | | Complete documentation of schema example and reference it from api docsTobias Koenig2009-05-201-0/+10
| | | | | | | | | |
| | | * | | | | | | First version of documentation for schema exampleTobias Koenig2009-05-192-9/+12
| | | | | | | | | |
| | | * | | | | | | Add missing example filesTobias Koenig2009-05-199-0/+168
| | | | | | | | | |
| | | * | | | | | | Adapt license headers to LGPLTobias Koenig2009-05-163-6/+96
| | | | | | | | | |
| | | * | | | | | | Add W3C XML Schema validation supportTobias Koenig2009-05-168-1/+335
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done by Tobias Koenig, as part of an internship at Trolltech/Qt Software, started at Wed Oct 1 18:32:43 2008 +0200, and the last commit being part of this commit dating Tue Feb 24 11:03:36 2009 +0100. This is work consisting of about 650 commits squashed into one, where the first commit was 61b280386c1905a15690fdd917dcbc8eb09b6283, in the repository before Qt's history cut.
| * | | | | | | | | Move all QML types to Qt/4.6 namespace.Warwick Allison2009-07-23120-0/+240
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust examples and demos accordingly. As per QT-558
* | | | | | | | | make scrollbars look nice again.Yann Bodson2009-07-231-7/+7
|/ / / / / / / /
* | | | | | | | Move the Script interface of QmlComponent to QmlBindableComponentAlan Alpert2009-07-211-2/+2
| | | | | | | |
* | | | | | | | Allow minehunt example to compile again.Alan Alpert2009-07-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmlbindablevalue had been renamed and no-one updated this file.
* | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-208-25/+37
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-2011-21/+174
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui