summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-11-221211-28100/+8829
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (72 commits) Add note to declarative calculator example Help: Add \depends to all declarative examples & demos Declarative Examples: Fall back to local qmlapplicationviewer. Fix qdoc output for <dependency> tag. Change installation location of examples. Add Symbian platform notes. Fix "make install" for declarative examples Add C++11 support and QThreadLocalStorage changes to docs. Update the license in the qmlapplicationviewer. Examples: Add Copright headers, Remove stray file. Compile fix. Fix use of qmlapplicationviewer. Doc: Create relative pathes in Manifest files. Doc: Copy manifest files to the places where Creator expects them. qdoc3: qdoc supports \depends in 4.8 qdoc3: qdoc supports \depends in 4.8 Update qrc files. Update qmlapplicationviewer template, cppextensions/qgraphicslayout example corrections demos/declarative/snake example corrections ...
| * Add note to declarative calculator exampleDaniel Molkentin2011-11-221-0/+6
| | | | | | | | | | | | | | This example is not meant to be executed without qmlviewer, yet most of it works. Add a warning for the uninitiated. Reviewed-by: trustme
| * Help: Add \depends to all declarative examples & demosDaniel Molkentin2011-11-229-9/+147
| | | | | | | | Reviwed-By: trustme
| * Declarative Examples: Fall back to local qmlapplicationviewer.Daniel Molkentin2011-11-2273-80/+151
| | | | | | | | Rubberstamped-by: Oswald Buddenhagen
| * Fix qdoc output for <dependency> tag.Daniel Molkentin2011-11-221-6/+3
| | | | | | | | | | | | Also prepend relative path if required. Reviewed-By: trustme
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingCasper van Donderen2011-11-2215-24/+100
| |\
| | * Fix "make install" for declarative examplesDaniel Molkentin2011-11-2215-24/+100
| | | | | | | | | | | | Reviewed-by: Oswald Buddenhagen
| * | Change installation location of examples.Casper van Donderen2011-11-2214-30/+30
| | | | | | | | | | | | | | | | | | The cppextensions examples were still installed to a previous location, the files had been moved within the source tree, but the .pro files were not changed accordingly.
| * | Add Symbian platform notes.Casper van Donderen2011-11-222-1/+457
| |/
| * Add C++11 support and QThreadLocalStorage changes to docs.Casper van Donderen2011-11-221-0/+8
| | | | | | | | | | | | The C++11 support was not documented in the "What's new" page. Reviewed-By: Frederik Gladhorn
| * Merge remote-tracking branch 'qt-doc-review/master'Casper van Donderen2011-11-223-0/+22
| |\
| | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-11-211-3/+8
| | |\ | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc3: qdoc supports \depends in 4.8
| | | * qdoc3: qdoc supports \depends in 4.8Martin Smith2011-11-211-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what you write... /*! \example designer/calculatorbuilder \depends qmlapplicationviewer \title Calculator Builder Example This is what you get... <example name="Calculator Builder Example" docUrl="qthelp://com.trolltech.qt.480/qdoc/designer-calculatorbuilder.html" projectPath="designer/calculatorbuilder/calculatorbuilder.pro" imageUrl="qthelp://com.trolltech.qt.480/qdoc/images/calculatorbuilder-example.png"> <description><![CDATA[The Calculator Builder example shows how to create a user interface from a Qt Designer form at run-time, using the QUiLoader class.]]></description> <tags>calculator,builder</tags> <fileToOpen>designer/calculatorbuilder/main.cpp</fileToOpen> <dependency>$QTDIR/examples/qmlapplicationviewer</dependency> </example> Task-number: QTBUG-22838
| | * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-11-213-0/+17
| | |\ \ | | | |/ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc3: qdoc supports \depends in 4.8
| | | * qdoc3: qdoc supports \depends in 4.8Martin Smith2011-11-213-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what you write... /*! \example designer/calculatorbuilder \depends examples/qmlapplicationviewer \title Calculator Builder Example This is what you get... <example name="Calculator Builder Example" docUrl="qthelp://com.trolltech.qt.480/qdoc/designer-calculatorbuilder.html" projectPath="designer/calculatorbuilder/calculatorbuilder.pro" imageUrl="qthelp://com.trolltech.qt.480/qdoc/images/calculatorbuilder-example.png"> <description><![CDATA[The Calculator Builder example shows how to create a user interface from a Qt Designer form at run-time, using the QUiLoader class.]]></description> <tags>calculator,builder</tags> <fileToOpen>designer/calculatorbuilder/main.cpp</fileToOpen> <depends>../../examples/qmlapplicationviewer</depends> </example> Task-number: QTBUG-22838
| * | | Update the license in the qmlapplicationviewer.Casper van Donderen2011-11-224-152/+152
| | | | | | | | | | | | | | | | | | | | | | | | The license had too many comments in them, these are now removed Reviewed-By: Trust me
| * | | Examples: Add Copright headers, Remove stray file.Daniel Molkentin2011-11-225-182/+156
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | Compile fix.Daniel Molkentin2011-11-211-2/+1
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | Fix use of qmlapplicationviewer.Daniel Molkentin2011-11-2180-158/+774
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Two separate copies for demos and example - Fix deployment (don't install to opt in desktop case) Reviewed-by: Casper van Donderen
| * | | Doc: Create relative pathes in Manifest files.Daniel Molkentin2011-11-211-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | Conditions: shadow build & non-prefix build Reviewed-by: Casper van Donderen
| * | | Doc: Copy manifest files to the places where Creator expects them.Daniel Molkentin2011-11-211-1/+14
| | | | | | | | | | | | | | | | Reviewed-by: Casper van Donderen
| * | | Update qrc files.Casper van Donderen2011-11-182-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The qml files were moved within the examples, the qrc files were not updated accordingly. This change fixes the problem. Reviewed-By: Daniel Molkentin
| * | | Update qmlapplicationviewer template,Casper van Donderen2011-11-173-146/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version of the template did not work on Harmattan, It caused the application executable to look in the $HOME directory, instead of the application directory. Reviewed-By: Daniel Molkentin
| * | | cppextensions/qgraphicslayout example correctionsartoka2011-11-172-31/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned qgraphicsgridlayout.pro and qgraphicslinearlayout.pro files. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | demos/declarative/snake example correctionsartoka2011-11-172-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed empty lines from snake.qml and Cookie.qml Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | demos/declarative/webbrowser example modificationsartoka2011-11-1722-3/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | demos/declarative/twitter example modificationsartoka2011-11-1730-3/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | demos/declarative/snake example modificationsartoka2011-11-1732-4/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | demos/declarative/samegame example modificationsartoka2011-11-1727-3/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | demos/declarative/rssnews example modificationsartoka2011-11-1716-3/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | demos/declarative/photoviewer example modificationsartoka2011-11-1725-3/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | demos/declarative/minehunt example modificationsartoka2011-11-1719-38/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | demos/declarative/flickr example modificationsartoka2011-11-1730-3/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | demos/declarative/calculator example modificationsartoka2011-11-1719-5/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | xml/xmlhttprequestexample example modificationsartoka2011-11-178-436/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | ui-components/tabwidget example modificationsartoka2011-11-1711-3/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | ui-components/spinner example modificationsartoka2011-11-179-30/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | ui-components/slideswitch example modificationsartoka2011-11-1712-604/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | ui-components/searchbox example modificationsartoka2011-11-1713-3/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | ui-components/scrollbar example modificationsartoka2011-11-1711-4/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | ui-components/progressbar example modificationsartoka2011-11-1711-592/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | ui-components/main example modificationsartoka2011-11-1724-500/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | ui-components/flipaple example modificationsartoka2011-11-1713-571/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | ui-components/dialcontrol example modificationsartoka2011-11-1717-672/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | Toys Examples Modificationsartoka2011-11-1793-3649/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | toys/ clocks, corkboards, dynamicscene, tic-tac-toe and tvtennis example modifications Modified examples to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | Touchintegration Examples Modificationsartoka2011-11-1726-1036/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | touchintegration/ gestures, mousearea and pincharea example modifications Modified examples to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | threading/ threadedlistmodel and workerscript example modificationsartoka2011-11-1720-6/+418
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified examples to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | text/textselection example modificationsartoka2011-11-1712-725/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | text/ availableFonts, banner, fonts and hello example modificationsartoka2011-11-1749-2061/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified examples to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * | | sqllocalstorage example modificationsartoka2011-11-179-3/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>