summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge branch '4.8'David Boddie2011-05-272-2/+2
|\ \ \ \ \
| * | | | | Doc: Fixed a scope test for maemo5 and made an error a warning instead.David Boddie2011-05-272-2/+2
| * | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-2414-2149/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
* | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-2414-2149/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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 branch '4.8'David Boddie2011-05-133-2/+6
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Doc: Added missing project and desktop files.David Boddie2011-05-1115-0/+235
| * | | | | Doc: Added fixes left over from previous merges.David Boddie2011-05-111-0/+3
| * | | | | Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-111318-0/+57782
| * | | | | Doc: Fixed incorrect button handling.David Boddie2011-05-091-2/+2
| * | | | | More examples adjusted to Symbian and Maemo5.Daniel Molkentin2011-05-052-0/+16
| * | | | | Added missing resource files.David Boddie2011-05-042-0/+12
| * | | | | Added missing data files. Renamed resource files.David Boddie2011-05-046-0/+159
| * | | | | Fixed line endings.David Boddie2011-05-047-0/+316
| * | | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-04712-3500/+4344
| |/ / / /
* | | | | 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 line endings.David Boddie2011-04-287-0/+316
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamDavid Boddie2011-04-289-315/+315
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-27712-3500/+4344
* | | | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-281878-1545/+58418
|/ / / / /
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-04-18313-439/+10412
|\ \ \ \ \ | |/ / / /
| * | | | 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