summaryrefslogtreecommitdiffstats
path: root/examples/declarative
Commit message (Expand)AuthorAgeFilesLines
* Removed demo files accidentally introduced by commit 3abaecc3.David Boddie2011-07-19176-9889/+0
* Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-2766-1133/+1133
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-2435-0/+1448
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-06-201-1/+11
| |\
| * | Qmlshadersplugin examples added.Marko Niemelä2011-06-1335-0/+1448
* | | Added missing license headers.David Boddie2011-06-173-0/+120
* | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-173-3/+13
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-311-1/+11
| |\ \ \ | | | |/ | | |/|
| | * | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA...Joona Petrell2011-05-271-1/+11
| | |/
| * | Merge remote-tracking branch 'qt/4.8' into master-qml-teamKai Koehne2011-05-241-0/+18
| |\ \
| * | | Fix QtDeclarative keyinteraction exampleYann Bodson2011-05-232-2/+2
* | | | Added missing license headers.David Boddie2011-06-153-0/+120
* | | | Doc: Added missing license headers for documentation and examples.David Boddie2011-06-08144-0/+5760
* | | | Merge branch '4.8'David Boddie2011-05-132-0/+4
|\ \ \ \
| * | | | Doc: Added missing project and desktop files.David Boddie2011-05-1114-0/+224
| * | | | Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-11963-0/+50211
| * | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-04139-2031/+4
| | |/ / | |/| |
* | | | Squashed merge of the master-temp branch.David Boddie2011-05-0616-0/+279
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamDavid Boddie2011-05-061-0/+18
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-031-0/+18
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-0/+18
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-141-0/+18
| | | |\
| | | | * Add pincharea.qmlproject file for PinchArea example.Martin Jones2011-04-141-0/+18
| | | * | Fixed license headers for examples in 4.7Timo Turunen2011-04-056-162/+156
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamDavid Boddie2011-04-282-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-27139-2031/+4
| |/ / /
* | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-28969-76/+48201
|/ / /
* | | Merge remote branch 'qa-review/master' into qa-staging-masterRohan McGovern2011-04-073-3/+3
|\ \ \
| * \ \ Merge qt/qt.git master into qa-team-masterRohan McGovern2011-03-2412-8/+1142
| |\ \ \
| * | | | Update copyright year to 2011.Jason McDonald2011-01-10237-237/+237
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-066-162/+156
|\ \ \ \ \
| * | | | | Fixed license headers for examples in masterTimo Turunen2011-04-056-162/+156
| | |/ / / | |/| | |
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-1/+1
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2212-151/+1021
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-091-2/+9
| |\ \ \
| * \ \ \ Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-231-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'jpasions-qt-doc-team-qtquick-4.7' into 4.7David Boddie2011-02-171-1/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' into jpasions-qt-doc-team-qtquick-4.7David Boddie2011-01-251-1/+2
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-17237-237/+237
| | |\ \ \ \ \ \
| | * | | | | | | Re-organized the Qt Quick page. Changed titles and links.Jerome Pasion2010-12-201-1/+1
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-0411-6/+262
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-2212-171/+1021
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | fixes/improvements for new QML right-to-left docsBea Lam2011-03-213-9/+9
| * | | | | | | | Write Qt Quick 1.1 right-to-left documentation and examplesJoona Petrell2011-03-1812-171/+1021
* | | | | | | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-112-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update copyright year to 2011.Rohan McGovern2011-03-102-2/+2
* | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-1/+21
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /
| * | | | | | | | PinchArea example produced incorrect scaling.Martin Jones2011-03-081-2/+9
| * | | | | | | | Merge branch '4.7' into qtquick11Martin Jones2011-03-012-2/+3
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Add LayoutMirroring attached property for mirroring QML layoutsJoona Petrell2011-03-011-1/+21
| | |_|/ / / / / | |/| | | | | |
generated by cgit v0.12 at 2024-11-26 06:32:46 (GMT)