summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* Update the license in the qmlapplicationviewer.Casper van Donderen2011-11-222-76/+76
* Examples: Add Copright headers, Remove stray file.Daniel Molkentin2011-11-222-16/+78
* Fix use of qmlapplicationviewer.Daniel Molkentin2011-11-2112-9/+411
* Update qrc files.Casper van Donderen2011-11-181-16/+15
* demos/declarative/snake example correctionsartoka2011-11-172-3/+1
* demos/declarative/webbrowser example modificationsartoka2011-11-1722-3/+209
* demos/declarative/twitter example modificationsartoka2011-11-1730-3/+209
* demos/declarative/snake example modificationsartoka2011-11-1732-4/+211
* demos/declarative/samegame example modificationsartoka2011-11-1727-3/+209
* demos/declarative/rssnews example modificationsartoka2011-11-1716-3/+209
* demos/declarative/photoviewer example modificationsartoka2011-11-1725-3/+209
* demos/declarative/minehunt example modificationsartoka2011-11-1719-38/+51
* demos/declarative/flickr example modificationsartoka2011-11-1730-3/+209
* demos/declarative/calculator example modificationsartoka2011-11-1719-5/+211
* Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-264-4/+4
|\
| * Fix files that don't end with a newline characterSergio Ahumada2011-08-124-4/+4
* | Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'suzuki toshiya2011-08-181-1/+1
|/
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-071-0/+1
|\
| * Update the Window title when closing the last tab.Casper van Donderen2011-07-071-0/+1
* | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-271-17/+17
* | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-1711-9/+504
|\ \
| * \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-085-9/+17
| |\ \
| | * \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-072-0/+8
| | |\ \ | | | |/
| | | * Have -small-screen enabled in certain examples on Symbian always.Laszlo Agocs2011-06-062-0/+8
| | | * Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-253-9/+9
| | | * Revert "Fixing Linux compatibility issues for Symbian"Laszlo Agocs2011-05-253-9/+9
| | * | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-243-9/+9
| | |\ \ | | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-183-9/+9
| | | |\
| | | | * Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-183-9/+9
| | | * | Update licenseheader text in source filesJyri Tahtela2011-05-13342-5846/+5846
| | | |/
| * | | Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-06342-5846/+5846
| |\ \ \ | | |/ /
| * | | Add missing license header.Jason Barron2011-06-031-0/+41
| * | | Add the new 'glhypnotizer' demo.Jason Barron2011-06-036-0/+446
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-24342-5846/+5846
|\ \ \ \ | | |/ / | |/| |
| * | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-13342-5846/+5846
| |/ /
* | | Doc: Added fixes left over from previous merges.David Boddie2011-05-111-1/+3
|/ /
* | Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-04-14268-517/+19225
|\ \
| * \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-07266-512/+19218
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-052-15/+12
| | |\
| | | * Removed mobile demos from the Symbian build in demos.proJerome Pasion2011-04-011-6/+3
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-311-3/+3
| | | |\
| | | * | Fixed demo subdirs for mobile examples.Jerome Pasion2011-03-301-6/+6
| | * | | Minor feature fix led to refactoring for i18n's sake.David Boddie2011-04-058-509/+859
| | * | | Fixed string-int concatenation issue.David Boddie2011-04-051-1/+1
| | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-281-1/+2
| | |\ \
| | * | | Imported demo documentation and their images.Jerome Pasion2011-03-106-397/+3
| | * | | Removed generated UI file. Not needed in the demo.Jerome Pasion2011-03-101-181/+0
| | * | | Adding quickhit and guitartuner mobile demos.Jerome Pasion2011-03-09205-0/+12750
| | * | | Removed 2 mobile demos. Their replacement will be added separately.Jerome Pasion2011-03-09209-13700/+0
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-091-2/+4
| | |\ \ \