aboutsummaryrefslogtreecommitdiffstats
path: root/examples/tutorials
Commit message (Collapse)AuthorAgeFilesLines
* Fix doc snippets paths and parsing errorsBea Lam2012-05-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtqml.qdocconf and qtquick.qdocconf now refer to the correct snippets and source directories. Snippet paths in .qdoc and .cpp files have been updated to refer to the new shortened path references, e.g. \snippet qml/file.cpp instead of \snippet doc/src/snippets/qml/file.cpp. This also deletes snippets from src/qml/doc/snippets that belonged under src/quick/doc/snippets (and were already duplicated there anyway) and restores some snippet files that shouldn't have been deleted. Also fixes some inline snippets to use \code .. \endcode instead of \qml .. \endqml as they contained javascript or partial QML snippets that were causing parsing errors from qdoc. There are still snippet errors arising from qmlintro.qdoc as the qmlintro snippets directory that it refers to cannot be located. There are also two references to a removed snippet identifier in examples/qml/cppextensions/plugins/plugin.cpp that need to be fixed in conjunction with the related docs in a later commit as the relevant code has changed and the docs are now invalid. Task-number: QTBUG-25721 Change-Id: I50c665245a74c140470c58a32546591d187dfe4b Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Update tutorialAlan Alpert2012-03-213-3/+3
| | | | | | | Updated paths, and updated arbitrary form factor Change-Id: I10ffedd6978fbe62050987a4e0e5ab8b120edfce Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Merge master <-> api_changesMatthew Vogt2012-03-05131-3/+7719
|\ | | | | | | Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
| * Examples refactor rebaseAlan Alpert2012-02-281-0/+1
| | | | | | | | | | | | | | | | Automatic rebase did not move some new files to where they should have gone. Change-Id: I25515d29d8992acde15db0df1bb5972e35573e60 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Start of examples refactorAlan Alpert2012-02-24127-0/+7716
| | | | | | | | | | | | | | | | | | | | | | | | This is the general reorg of the examples directory structure, plus additional guidelines. calculator, animations and accessibility have been updated to the new standards and tested, as an example. Task-number: QTBUG-24133 Change-Id: I76c3b86751d3195ba2a5474ff23afb875765e9a4 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * Use new plugin system in QtDeclarative.Friedemann Kleint2012-02-233-3/+2
| | | | | | | | | | | | | | | | - Use prefix "org.qt-project" for interfaces. - Use new macros, add json files. Change-Id: I53df83f95153c5c9c462098584606284470a5ae0 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* | Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-2450-80/+80
|/ | | | | | | | | | | | | Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3048-48/+48
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: If39bd256b0fa85eba17ea30f8ab87ea27d758908 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-2348-48/+48
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-0548-48/+48
| | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Examples: Remove commented out 'plugins' list from .qmlproject filesKai Koehne2012-01-045-10/+0
| | | | | Change-Id: I24bacdd52f2f191dde8e0a2fa9718b38ab329597 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Examples: Hard-code the 'main' file in .qmlprojectKai Koehne2012-01-031-2/+0
| | | | | | | | | | | Set the 'mainFile:' property in .qmlproject files where it makes sense (i.e. there's one natural candidate). This makes sure Qt Creator doesn't fall back to 'current file in editor' as main file, which is unexpected to a lot of people. (This requires Qt Creator version 2.2 and newer). Change-Id: Ia5d20b0d982038520d7892bca155267c5f13644b Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Have tutorial built along with other examplesAlan Alpert2011-12-0178-0/+2
| | | | | Change-Id: I9f64659ca1621a5fea8e9013ecd264d971207d4d Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Update to QtQuick 2.0Alan Alpert2011-11-2936-36/+36
| | | | | | | Note that the plugin only exposes QObject types, not QDeclarativeItem. Change-Id: I817d143f762239e32456a7ac8fcca29c483a4f8e Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Get the tutorial running againAlan Alpert2011-11-2912-53/+11
| | | | | | | Note that it still uses QtQuick 1.0 Change-Id: I1b6e174c2ec06ba6108f11cb295e32bc76ac3e36 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Remove embarassing line from tutorial.Frederik Gladhorn2011-11-162-4/+5
| | | | | Change-Id: Ie392214f1b0bea0314ebf94f24fac1122db6483a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-234-4/+4
| | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
* Initial import from the monolithic Qt.Qt by Nokia2011-04-2777-0/+5343
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12