summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'qt/4.8' into master-qml-teamKai Koehne2011-05-2416-2149/+24
|\
| * Revert all QScroller and QFlickGesture related code.Robert Griebl2011-05-1614-2149/+0
| * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-031-0/+6
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-05-021-0/+6
| | |\
| | | * Ensured that incomplete downloads are removed.David Boddie2011-04-071-0/+6
| * | | 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
* | | | | Fix QtDeclarative keyinteraction exampleYann Bodson2011-05-232-2/+2
|/ / / /
* | | | 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-2437-66/+1240
| |\ \ \ \
| * | | | | Update copyright year to 2011.Jason McDonald2011-01-101455-1463/+1463
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-07277-3/+9488
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-04-061-2/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Removed invalid public slots section.David Boddie2011-04-051-2/+0
| * | | | | Fixed license headers for examples in 4.7Timo Turunen2011-04-057-189/+182
| |/ / / /
| * | | | Doc: Work on GettingStartedQt tutorialGeir Vattekar2011-03-296-0/+468
| * | | | Merge branch 'clone_4.7' into 4.7Jerome Pasion2011-03-23270-1/+9020
| |\ \ \ \
| | * | | | Added QtWebKit Guide JavaScript files.Jerome Pasion2011-03-2214-0/+897
| | * | | | Adding QtWebKit Guide example images and created links to images.Jerome Pasion2011-03-22178-27/+26
| | * | | | Fixed style issue and replaced image.Jerome Pasion2011-03-221-1/+1
| | * | | | Adding QtWebKit Guide CSS files.Jerome Pasion2011-03-2241-0/+4271
| | * | | | Edited QtWebKit Guide.Jerome Pasion2011-03-211-0/+258
| | * | | | Removed compile instruction for the webkit-guide code.Jerome Pasion2011-03-181-1/+0
| | * | | | Edited QtWebKit Guide CSS chapter. Created example links.Jerome Pasion2011-03-171-1/+2
| | * | | | Fixed style issues with QtWebKit guide and examples.Jerome Pasion2011-03-151-7/+7
| | * | | | Adding QtWebKit Guide (BETA).Jerome Pasion2011-03-1539-0/+3594
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2214-153/+1033
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-0616-432/+416
|\ \ \ \ \ \
| * | | | | | Fixed license headers for examples in masterTimo Turunen2011-04-0516-432/+416
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-3124-2/+974
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2213-151/+1024
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-091-2/+9
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Doc: Fixed memory leak in undo framework exampleGeir Vattekar2011-03-022-0/+7
| * | | | | | Doc: Added a threading tutorial.David Boddie2011-02-2420-1/+964
| * | | | | | 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-253-3/+4
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-171441-1452/+1454
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Re-organized the Qt Quick page. Changed titles and links.Jerome Pasion2010-12-201-1/+1
| | * | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-151-1/+1
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Doc: Fixed example project file for Symbian.David Boddie2011-02-151-0/+2
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-0411-6/+262
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-241-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Examples: Make the download example also print the SSL errorsThiago Macieira2011-03-221-0/+17
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-2212-171/+1021
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | / / / | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-2112-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 branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-151-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |