summaryrefslogtreecommitdiffstats
path: root/doc/src/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-077-20/+35
|\ | | | | | | | | | | Conflicts: doc/src/declarative/propertybinding.qdoc src/declarative/util/qdeclarativeview.cpp
| * Doc: Fixed warnings and other problems found while fixing markup.David Boddie2011-02-075-15/+15
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-042-5/+20
| |\
| | * Add initial size to ListView in FolderListModel exampleBea Lam2011-02-021-1/+6
| | | | | | | | | | | | Plus other minor doc changes
| | * Add a layout direction example to positionersJoona Petrell2011-01-191-4/+14
| | | | | | | | | | | | | | | Task-number: Reviewed-by: Alan Alpert
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-041-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/extending.qdoc doc/src/external-resources.qdoc src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativetransition.cpp
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-265-2/+8
| |\ \
| * | | Doc: Fixed qdoc warnings about broken links.David Boddie2011-01-261-2/+2
| | | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-265-2/+8
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Fixing a merge conflict. Conflicts: doc/src/overviews.qdoc
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-01-251-1/+1
| |\ \ \
| | * | | Doc: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-251-1/+1
| | |/ /
| * | | Doc: Fixed missing images in qt demoGeir Vattekar2011-01-254-1/+7
| |/ / | | | | | | | | | Task-number: QTBUG-14274
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-17257-257/+257
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/elements.qdoc doc/src/declarative/extending.qdoc src/declarative/qml/qdeclarativecomponent.cpp
| * | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-13257-257/+257
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativeintro.qdoc doc/src/declarative/qdeclarativereference.qdoc doc/src/snippets/declarative/focus/focusColumn.qml tools/qdoc3/apigenerator.cpp tools/qdoc3/apigenerator.h tools/qdoc3/archiveextractor.cpp tools/qdoc3/bookgenerator.cpp tools/qdoc3/bookgenerator.h tools/qdoc3/ccodeparser.cpp tools/qdoc3/command.cpp tools/qdoc3/command.h tools/qdoc3/cpptoqsconverter.cpp tools/qdoc3/dcfsection.cpp tools/qdoc3/dcfsection.h tools/qdoc3/jambiapiparser.cpp tools/qdoc3/jambiapiparser.h tools/qdoc3/javacodemarker.cpp tools/qdoc3/javacodemarker.h tools/qdoc3/javadocgenerator.cpp tools/qdoc3/javadocgenerator.h tools/qdoc3/linguistgenerator.cpp tools/qdoc3/linguistgenerator.h tools/qdoc3/loutgenerator.h tools/qdoc3/mangenerator.cpp tools/qdoc3/mangenerator.h tools/qdoc3/polyarchiveextractor.cpp tools/qdoc3/polyarchiveextractor.h tools/qdoc3/polyuncompressor.cpp tools/qdoc3/polyuncompressor.h tools/qdoc3/qsakernelparser.cpp tools/qdoc3/qscodemarker.cpp tools/qdoc3/qscodemarker.h tools/qdoc3/qscodeparser.cpp tools/qdoc3/qscodeparser.h tools/qdoc3/sgmlgenerator.cpp tools/qdoc3/sgmlgenerator.h tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/uncompressor.cpp tools/qdoc3/webxmlgenerator.cpp tools/qdoc3/webxmlgenerator.h
| | * Update copyright year to 2011.Jason McDonald2011-01-10257-257/+257
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Re-organized the Qt Quick page. Changed titles and links.Jerome Pasion2010-12-201-14/+14
|/ / | | | | | | Task-number: QTBUG-16071
* | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-151-1/+1
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-12-091-1/+2
| |\
| * | Doc: Fixed doc bug in Diagram Scene exampleGeir Vattekar2010-12-091-1/+1
| | | | | | | | | | | | Task-number: QTBUG-15647
* | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-141-1/+2
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: tools/qdoc3/atom.h tools/qdoc3/qdoc3.pro
| * | Add 'Writing New Components' docs, and document the connect() function.Bea Lam2010-12-031-1/+2
| |/ | | | | | | | | | | | | | | The 'Writing QML Components' is mainly a restructuring of the 'Extending types from QML' page. It also documents the signal connect() function that was previously undocumented. Task-number: QTBUG-15718, QTBUG-15138
* | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-071-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/platforms/compiler-notes.qdoc tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/ditaxmlgenerator.h tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h tools/qdoc3/node.cpp tools/qdoc3/pagegenerator.h
| * Doc: Fixed qdoc warnings.David Boddie2010-10-081-2/+3
| |
* | doc: Corrections to linking errors detected by the DITA XML generator..Martin Smith2010-11-011-3/+2
|/
* Resized image, added missing files, and reformatted documentation ofJerome Pasion2010-10-081-10/+14
| | | | QtWebKit Image Analyzer example.
* Doc: correct spellingMorten Engvoldsen2010-10-071-1/+1
|
* Added the QtWebKit bridge Image Analyzer example.Jerome Pasion2010-10-041-0/+155
| | | | | | | Originally written by Jervey Kong. Task-number: QTBUG-14154 Reviewed-by: David Boddie
* Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-04256-1280/+1280
| | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files.
* Doc: Made a number of fixes to the documentation.David Boddie2010-10-042-5/+43
|
* Doc: More work on the QML documentation.David Boddie2010-09-071-1/+1
|
* Merge branch '4.7' into qmldocsDavid Boddie2010-09-011-2/+2
|\ | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativetext.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp
| * Updated Twitter demo in response to the new Twitter oauth requirementJens Bache-Wiig2010-08-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Twitter is blocking access to the old authentification method that our demo was using. This breaks the demo completely. To fix this, I changed the demo into only make use of the public search API. You can no longer tweet but you can search for different tweets. At the moment making an oauth capable demo is not desirable due to the problems with handling a secret app token among other issues. Task-number: QTBUG-13181 Reviewed-by: Alan Alpert
* | Merge branch '4.7' into qmldocsDavid Boddie2010-08-272-0/+15
|\ \ | |/
| * Document calling QObject methods from QML in Extending QML in C++ docs.Martin Jones2010-08-252-0/+15
| |
* | Doc: More work on the QML documentation.David Boddie2010-08-271-1/+1
|/
* Fix minehunt demo for SymbianJoona Petrell2010-08-201-1/+1
| | | | | Task-number: QTBUG-8927 Reviewed-by: Alan Alpert
* diagramscene example: fix leak and crashes.Olivier Goffart2010-08-161-1/+2
| | | | | | | | | | | | | | | In MainWindow::deleteItem, if there is arrow selected, we need to clean up the items from this arrow. We need to delete them first so there is no arrow in the list anymore when we calls removeArrows (which before, deleted arrow that were possibly in the list, resulting in crashes) Also avoid leak by giving parents to objects that needs it, and destroying items. Reviewed-by: Geir Vattekar Task-number: QTBUG-12753 Merge-request: 775 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-132-9/+10
|\ | | | | | | | | | | | | Conflicts: doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/index.qdoc
| * Merge commit 'remotes/origin/4.7' into qt47s2Thomas Zander2010-08-112-9/+11
| |\ |/ / | | | | | | | | | | | | Conflicts: doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/index.qdoc src/declarative/qml/qdeclarativeimageprovider.cpp
| * doc: Fixed some qdoc errors.Martin Smith2010-08-093-10/+13
| |
* | Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-091-2/+0
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc src/dbus/qdbusconnection.cpp src/gui/s60framework/qs60mainapplication.cpp src/gui/s60framework/qs60mainappui.cpp src/network/access/qnetworkrequest.cpp src/network/bearer/qnetworkconfiguration.h
| * doc: Fixed some missing images.Martin Smith2010-08-061-2/+0
| | | | | | | | Task-nr: QTBUG-8246
* | Doc: Fixed qdoc warnings.David Boddie2010-08-053-5/+5
|/ | | | Reviewed-by: Trust Me
* Make it possible to manually set the orientation of QML Viewer on SymbianJoona Petrell2010-08-031-0/+8
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12142 Reviewed-by: Warwick Allison This patch brings ability to switch QML Viewer's orientation between auto-orientation (=follow sensor), portrait and landscape orientations (lock orientation) on Symbian. It provides same orientation options as Qt Creator 2.1's Qt QML Standalone Application creation wizard. Also, menu item rotateOrientation now works on Symbian, but it's hidden when orientation mode is set to auto-orientation. Property runtime.orientation has been switched back to supporting four-way orientation on Symbian, previously it only updated values between portrait and landscape. If your application only supports landscape or portrait modes, just don't react to the inverted orientations. Added orientation example screenorientation under examples/declarative. The patch includes a fix for calculator example, which rotated to wrong direction when switching from portrait to landscape. Also, improved qdeclarativeviewer unit tests. Changes have been tested to work on Windows, Linux and Symbian^3.
* Append 'Example' to titles of example pagesBea Lam2010-07-291-48/+48
| | | | Task-number: QTBUG-12427
* Added files that had been renamed.Kevin Wright2010-07-272-0/+72
|
* Modified file/directory names and text to remove disallowed terminology.Kevin Wright2010-07-274-78/+6
|
* PathView doc clarification.Martin Jones2010-07-191-0/+9
|
* Fixing merge conflicts.Martin Smith2010-07-132-33/+26
|\ | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7 Conflicts: doc/src/declarative/advtutorial.qdoc src/declarative/graphicsitems/qdeclarativeloader.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp src/declarative/qml/qdeclarativeengine.cpp src/declarative/util/qdeclarativexmllistmodel.cpp
| * Follow -> Behaviormae2010-07-081-3/+3
| | | | | | | | Replace the usages of Follows with Behaviors, update docs.