summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix declarative examples and demos issue on WindowsDaniel Molkentin2011-12-062-4/+0
| | | | | | | | On Windows, if the resulting binaries reside in /Delease and /Debug subdirs. Thus we require the same hack as on Meego where the binary alone resides in the /bin subdir. Reviewed-by: Alessandro Portale
* Added missing license header.Rohan McGovern2011-11-251-0/+40
|
* Adjust pathes once again.Daniel Molkentin2011-11-241-3/+3
| | | | Reviewed-by: trustme
* Fixed a linkKevin Wright2011-11-241-1/+1
|
* Fixed a linkKevin Wright2011-11-241-1/+1
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingKevin Wright2011-11-249-0/+10
|\
| * Rename files to show up in docs.Casper van Donderen2011-11-249-0/+10
| |
* | Split behavior and wigglytext examplesKevin Wright2011-11-248-0/+214
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingKevin Wright2011-11-24175-2955/+49
|\
| * Fix up examples.Daniel Molkentin2011-11-24175-2955/+49
| | | | | | | | | | | | | | | | | | - Remove dependencies from examples - Remove stray copies of qtc_packaging - remove .desktop files - rename examples (to their old name) Reviewed-By: Casper van Donderen
* | Whitespace changes and added depends.Kevin Wright2011-11-241-5/+5
|/
* Fixed some linking issues.Kevin Wright2011-11-242-2/+5
|
* Removed unecessary files from folders.Kevin Wright2011-11-2416-532/+0
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingCasper van Donderen2011-11-2429-1701/+5
|\
| * Changed some of the short descriptions for WebView examples.Kevin Wright2011-11-241-3/+3
| |
| * Removed unecessary duplicate files.Kevin Wright2011-11-2429-1698/+2
| |
* | Fixes for the manifest and links.Casper van Donderen2011-11-242-9/+7
|/
* Fix link to WebView examples.Casper van Donderen2011-11-241-9/+10
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingCasper van Donderen2011-11-241-13/+16
|\
| * Fixed lists to be ordered lists and added curly bracketsKevin Wright2011-11-241-13/+16
| |
* | Fix link to ListView and WebView example pages.Casper van Donderen2011-11-241-2/+2
| |
* | Change the links to behavior examples.Casper van Donderen2011-11-242-2/+2
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingKevin Wright2011-11-243-11/+4
|\
| * Fix warning about unbalanced parantheses.Daniel Molkentin2011-11-241-4/+4
| | | | | | | | Reviewed-By: Robert Loehning
| * Fix abstractitemmodel compilation error.Daniel Molkentin2011-11-242-7/+0
| |
* | 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-2411-128/+77
|
* Compile fix for Mac OS X.Daniel Molkentin2011-11-241-1/+1
| | | | Reviewed-By; Casper van Donderen
* Fix build error: specifying full path to pro file is required here.Daniel Molkentin2011-11-233-6/+6
| | | | Reviewed-By: Oswald Buddenhagen
* Fix manifest install rule on windowsDaniel Molkentin2011-11-231-2/+8
| | | | Reviewed-by: Oswald Buddenhagen
* 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