summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-192-69/+38
|\ | | | | | | qtscript-jsc-backend
| * Fixes compileBill King2009-08-192-0/+10
| |
| * Added two convenience functions to QXmlStreamReaderThorbjørn Lindeijer2009-08-183-78/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QXmlStreamReader::readNextStartElement reads until the next start element within the current element, or returns false when no such element is encountered before the end element is reached. It simplifies the common case of iterating over the elements in an XML document. QXmlStreamReader::skipCurrentElement reads until the end element of the current element, skipping any child elements. This functionality was requested in two tasks, and a similar function 'readUnknownElement' was present in Qt's stream reader example. Autotest is included, example and documentation have been updated. Task-number: 238793 Reviewed-by: mae
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-143-5/+5
|\ \ | |/ | | | | qtscript-jsc-backend
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-141078-1136/+1134
| |\
| | * Get the pinchzoom working againBradley T. Hughes2009-08-132-4/+4
| | | | | | | | | | | | | | | Touch events on scrollarea based classes should enable touch on the viewport and handle the events in a viewportEvent() reimplementation.
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-1034-60/+2615
| |\ \
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-045-28/+237
| |\ \ \
| * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-032-3/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-08-022-2/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-07-31128-9285/+251
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtWarwick Allison2009-07-1718-9/+631
| |\ \ \ \ \ \ \
| * | | | | | | | unwarnWarwick Allison2009-07-171-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-121078-1132/+1132
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtscript-jsc-backend Conflicts: configure src/script/qscriptarray_p.h src/script/qscriptasm.cpp src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata.cpp src/script/qscriptclassdata_p.h src/script/qscriptclassinfo_p.h src/script/qscriptclasspropertyiterator_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptcontextinfo_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmaboolean_p.h src/script/qscriptecmacore.cpp src/script/qscriptecmacore_p.h src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptengineagent_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptextvariant_p.h src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptglobals_p.h src/script/qscriptmember_p.h src/script/qscriptnameid_p.h src/script/qscriptnodepool_p.h src/script/qscriptobject_p.h src/script/qscriptobjectfwd_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptsyntaxcheckresult_p.h src/script/qscriptvalue.cpp src/script/qscriptvalue_p.h src/script/qscriptvaluefwd_p.h src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptvalueiteratorimpl_p.h
| * | | | | | | | Update obsolete email addresses.Jason McDonald2009-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | Replace some mentions of Trolltech with more appropriate terms.Jason McDonald2009-08-129-23/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | Update obsolete URL's in code and docs.Jason McDonald2009-08-123-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | Update references to online documentation.Jason McDonald2009-08-129-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | Eliminate last mentions of "Qt Software".Jason McDonald2009-08-123-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | Update URL's to use new domain.Jason McDonald2009-08-126-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | Update contact URL in license headers.Jason McDonald2009-08-121068-1068/+1068
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | Compile fix with namespaceshjk2009-08-101-0/+2
| | | | | | | |
* | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-106-0/+465
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtscript-jsc-backend Conflicts: src/script/api/qscriptable.cpp src/script/api/qscriptable_p.h src/script/qscriptclassdata.cpp
| * | | | | | | 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.
* | | | | | | | add configure options for (not) building the QtScript moduleKent Hansen2009-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -script (default) and -no-script. This means we can get rid of the SCRIPT feature from qfeatures, since it's now handled by the new configure variable. It also allows us to get rid of all the QT_NO_SCRIPT ifdefs from the source files, since qmake isn't going to include those files for compilation when you configure with -no-script. The QtScriptTools module will be disabled if the QtScript module is not built. You'll have to build the old QtScript back-end (will be made available in a separate package), then build the QtScriptTools module yourself. Reviewed-by: Simon Hausmann
* | | | | | | | merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-067-12/+313
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtscript-jsc-backend Conflicts: tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
| * | | | | | | 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 branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-0530-38/+2032
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtscript-jsc-backend Conflicts: src/script/qscriptextqobject.cpp
| * | | | | | | 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.
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-07-3078-6527/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtscript-jsc-backend Conflicts: src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp src/script/qscriptbuffer_p.h src/script/qscriptclassinfo_p.h src/script/qscriptecmadate.cpp src/script/qscriptgc_p.h src/script/qscriptmemberfwd_p.h src/script/qscriptsyntaxcheckresult_p.h src/script/qscriptvalueimplfwd_p.h tests/auto/qscriptengine/tst_qscriptengine.cpp util/webkit/mkdist-webkit
| * | | | 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".
* | | | | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-07-2879-2715/+809
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qregexp.cpp src/script/qscriptengine.cpp src/script/qscriptvalue.cpp
| * | | | 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
| * | | | 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