summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master'Jason Barron2009-08-131078-1132/+1139
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
| * 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.
| * 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 commit 'qt/master-stable'Jason Barron2009-08-1015-58/+841
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/widgets/qdatetimeedit.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlineedit.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qmultiscreen/qmultiscreen.pro tests/auto/qresourceengine/qresourceengine.pro tests/auto/qresourceengine/tst_qresourceengine.cpp tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.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.
| * 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>
* | Update license headers according to commit 858c70f768e.axis2009-08-068-14/+14
| | | | | | | | RevBy: Trust me
* | Replaced $MODULE$ with hardcoded module names.axis2009-08-061-1/+1
| | | | | | | | RevBy: Trust me
* | Fixed network examples building for SymbianMiikka Heikkinen2009-08-061-1/+2
| |
* | Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-061-1/+1
| | | | | | | | | | | | Rationale: We're using template magic now to get the private pointer in qglobal.h, so no need to have two macros. Also keeps backward compatibility with outside (KDE) code.
* | Merge commit 'qt/master-stable'Jason Barron2009-08-0624-30/+2009
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe doc/src/classes/qnamespace.qdoc examples/examples.pro src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qobject.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qstandardgestures.h src/gui/kernel/qwidget.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 commit 'origin/master'Jason Barron2009-08-0612-35/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qfilesystemmodel/qfilesystemmodel.pro tests/auto/qfontdialog/tst_qfontdialog.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp tests/auto/qsqldriver/qsqldriver.pro tests/auto/qsqlquery/qsqlquery.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qstatemachine/tst_qstatemachine.cpp tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * | | Further code style cleanup fro demos and examplesJanne Anttila2009-08-042-2/+1
| | | |
| * | | 'Trailing whitespace' and 'blank line' fixes for demos and examplesJanne Anttila2009-08-0410-33/+32
| | | |
* | | | Merge commit 'origin/master'Jason Barron2009-08-049-9/+243
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
| * | | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
| * | | Added some spaces to pkg_prerules statements to make output more readable.Janne Anttila2009-07-301-1/+3
| | | |
| * | | Extended PKG customization possibilities via qmake.Janne Anttila2009-07-291-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: 242139 This commit replaces Symbian specific 'depends' keyword in qmake DEPLOYMENT variable with two more generic ones. The new keywords are 'pkg_prerules' and 'pkg_postrules', and they allow developer to pass raw data to PKG file. The strings in 'pkg_prerules' are added before PKG file package-body headers and 'pkg_postrules' after them. Correspondingly as old 'depends' keyword, the new keywords are not parsed by qmake, so they must be in a format understood by Symbian package generation tools. Note that 'pkg_prerules' can also replace default language, package-header and vendor statements in pkg file. If you decide to override any of these statements, you need to pay attention that also other statements stay valid.
| * | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-07-276-7/+228
| |\ \ \
| | * | | Adding some interesting functions that help findingAleksandar Sasha Babic2009-07-272-5/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info about network interfaces and network routes. Can be of broader interest. "By seeking and blundering we learn." Johann Wolfgang Von Goethe (1749 - 1832)
| | * | | Adaptation done to make network-chat work on S60.Aleksandar Sasha Babic2009-07-244-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Many attempts to communicate are nullified by saying too much." Robert Greenleaf(1904-1990)
| * | | | Enabled QtUiTools and related example building for Symbian OS.Janne Anttila2009-07-271-0/+1
| |/ / /
* | | | Merge commit 'qt/master-stable'Jason Barron2009-08-0412-15/+34
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * | | 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
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-3072-6521/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro src/gui/graphicsview/qgraphicsitem_p.h
| * | | Move sub-attaq from examples to demos because sub-attaq is a bitAlexis Menard2009-07-2872-6521/+0
| | | | | | | | | | | | | | | | too "advanced".
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-2927-2396/+1
|\ \ \ \ | |/ / /
| * | | 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