summaryrefslogtreecommitdiffstats
path: root/doc/src/examples
Commit message (Collapse)AuthorAgeFilesLines
* Various Qt documentation fixes (wk 44)artoka2012-01-311-2/+3
| | | | | | | | | | | | | | | | Task-number: QTBUG-13362 Task-number: QTBUG-18356 Task-number: QTBUG-18417 Task-number: QTBUG-18664 Task-number: QTBUG-21562 Task-number: QTBUG-22094 Task-number: QTBUG-18741 Task-number: QTBUG-15921 Task-number: QTBUG-22172 Task-number: QTBUG-15738 Change-Id: I1d383a22612cd4fbcb7e03751e76409ca57fe7a2 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-11269-269/+269
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Split behavior and wigglytext examplesKevin Wright2011-11-241-0/+9
|
* Whitespace changes and added depends.Kevin Wright2011-11-241-5/+5
|
* Fixed some linking issues.Kevin Wright2011-11-241-1/+3
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingCasper van Donderen2011-11-241-5/+5
|\
| * Changed some of the short descriptions for WebView examples.Kevin Wright2011-11-241-3/+3
| |
| * Removed unecessary duplicate files.Kevin Wright2011-11-241-2/+2
| |
* | Fixes for the manifest and links.Casper van Donderen2011-11-241-6/+4
|/
* Fix link to WebView examples.Casper van Donderen2011-11-241-9/+10
|
* Fixed lists to be ordered lists and added curly bracketsKevin Wright2011-11-241-13/+16
|
* Split ListView and WebView examples.Kevin Wright2011-11-241-1/+27
|
* Close the comments on some examples.Casper van Donderen2011-11-241-2/+13
|
* Update documentation for QML examples.Casper van Donderen2011-11-2410-128/+74
|
* Help: Add \depends to all declarative examples & demosDaniel Molkentin2011-11-229-9/+147
| | | | Reviwed-By: trustme
* Fix multiple typos in documentation.artoka2011-11-011-6/+6
| | | | | | | | | | | | | | | | | Link typo in the forum nokia icon article. Typo in the Symbian qt introduction document. Typos in the Diagram Scene example documentation. The link url was ending with a slash character in the icon article. Slash characted removed. In the symbian introduction doc there was a missing "p" character in the environment variables listing (QT_SIS_OPTIONS). There was 6 typos in the Diagram Scene example documentation. Task-numbers: QTBUG-13983, QTBUG-11820, QTBUG-14732 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Add briefs for the new 4.8 examples.Casper van Donderen2011-09-016-6/+6
|
* Add a brief to all demos and examples for manifestCasper van Donderen2011-09-01259-358/+504
| | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/broadcastreceiver.qdoc doc/src/examples/combowidgetmapper.qdoc doc/src/examples/dragdroprobot.qdoc doc/src/examples/elasticnodes.qdoc doc/src/examples/fademessage.qdoc doc/src/examples/fingerpaint.qdoc doc/src/examples/portedasteroids.qdoc doc/src/examples/portedcanvas.qdoc doc/src/examples/qml-examples.qdoc doc/src/examples/recipes.qdoc doc/src/examples/rsslisting.qdoc doc/src/examples/schema.qdoc
* Merge branch '4.8'Casper van Donderen2011-08-303-13/+39
|\ | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc
| * Doc: Added a note to Code Editor example docsGeir Vattekar2011-08-251-0/+26
| | | | | | | | | | Task-number: QTBUG-9004 Reviewed-by: David Boddie
| * Doc: QItemDelegate->QStyledItemDelegate in Star Delegate docsGeir Vattekar2011-08-251-12/+12
| | | | | | | | Task-number: QTBUG-9440
| * Phase 1 of QTBUG-20412, the XML manifest fileMartin Smith2011-07-151-1/+1
| |
| * Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-24261-2709/+2600
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
* | | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-274-47/+47
| | | | | | | | | | | | | | | | | | New files after previous license change round. Reviewed-by: Trust Me
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-241-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qpixmap_raster_symbian.cpp src/gui/image/qpixmapdatafactory.cpp src/gui/painting/qgraphicssystem.cpp src/gui/styles/qs60style.cpp src/network/bearer/qnetworkconfigmanager_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtOpenGLu.def src/s60installs/bwins/QtOpenVGu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
| * | | Qmlshadersplugin examples added.Marko Niemelä2011-06-131-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Example application for OpenGL shading language and QML. Added also a link from qml examples main documents labs section. Reviewed-by: Kim Gronholm
| * | | Update licenseheader text in source filesJyri Tahtela2011-05-13258-2580/+2580
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | | Doc: Added missing license headers for documentation and examples.David Boddie2011-06-085-55/+55
| | | |
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-24261-2709/+2600
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-109/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp
| | * | Revert all QScroller and QFlickGesture related code.Robert Griebl2011-05-161-109/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 0274e68767cce6440515a68d6af868725d5577a4 2770b1277744bb676e96e4ae8c89acd645ec895d 02e1f4e83dc8e3c4ab957095167b3d34c51ba3c1 fdf3be5b6b5db75833e0a7e9a90445ddd794fe4d d1f9a534da288884f443a975f428b0cfe0a7b29b 205d607c3387d074fb87f8deb77a8f515ae2e189 32d200da9cc7a4dfb3f302f22ef5718a286845c9 3e0df49f978933b1e4e6b48c695bf813ec9a2828 82bbc1c1611bde33680d22a1a3c6449e51d7b0b9 b78ffe51f9a4c4ac705e435d45fffe39864c032d fe438d7d828021d7f86301af36fe8dff2768532a df30d58de183d13c649ef7e0fbb8e2b3658e0862 fa845566b3733bc06454b71e33b1ff405ba32280 4f9a318d639c4e7e09e56751d31608fb39d472af 4810b587a65d81f8f90646efd09cadeb1276a756 7bad867382ad6c84155ffcfbb361709a8e8184ab 64ec011c6132496eb9555c1d09e7fd4ddf472837 81492e56aba5b5761500543665012a85d6835513 b668857b3749b39c3a61e0a25e750740b74df552 78a7a02b3b85435bc28eb23e9210522467171e42 Reviewed-By: Ralf Engels
| * | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-13261-2610/+2610
| |/ / | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
| * | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-031-1/+3
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicslayout.cpp src/gui/graphicsview/qgraphicslayout_p.cpp
| | * Ensured that incomplete downloads are removed.David Boddie2011-04-071-1/+3
| | | | | | | | | | | | Task-number: QTBUG-18509
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-221-11/+43
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc doc/src/examples/qml-examples.qdoc
* | | | Doc: Made an additional change for clarity.David Boddie2011-05-111-2/+3
| | | | | | | | | | | | | | | | Task-number: QT-4891
* | | | Doc: Noted that the example will not work as expected with a mouse.David Boddie2011-05-111-1/+4
| | | | | | | | | | | | | | | | Task-number: QT-4891
* | | | Doc: Various fixes to documentation, some based on changes in master.David Boddie2011-05-112-1/+13
| | | |
* | | | Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-119-0/+1601
| | | |
* | | | Doc: Fixed typo.David Boddie2011-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18994 (cherry picked from commit bf0926fff333398660fd51ae6b08699783100057)
* | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-0410-13/+16
|/ / / | | | | | | | | | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-3121-104/+136
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-221-11/+43
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/examples/qml-examples.qdoc
| * | Doc: Fixed doc bug in undo framework exampleGeir Vattekar2011-03-171-2/+1
| | | | | | | | | | | | Task-number: QTBUG-14580
| * | Doc: Fixed a doc bug in the Rogue exampleGeir Vattekar2011-03-071-2/+2
| | |
| * | Doc: Converted the Internationalization with Qt document into a group.David Boddie2011-03-011-0/+1
| | |
| * | Merge branch 'mimir' into 4.7David Boddie2011-02-233-50/+23
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativemodels.qdoc doc/src/index.qdoc doc/src/template/style/style.css tools/qdoc3/atom.h tools/qdoc3/doc.cpp tools/qdoc3/doc/qdoc-manual.qdoc tools/qdoc3/doc/qdoc-manual.qdocconf
| | * | qdoc: Added the \span command.Martin Smith2011-01-241-42/+19
| | | | | | | | | | | | | | | | e.g. \span {id="color-red"} {Color this text only}, not this text.
| | * | qdoc: Removed some uses of \raw an d \endraw.Martin Smith2011-01-201-6/+2
| | | | | | | | | | | | | | | | 8 instances of raw-html remain.
| | * | qdoc: Added colorizing of individual table cells.Martin Smith2011-01-141-2/+2
| | | |