summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \
| | * | | | Adding changes to mobile demos.Jerome Pasion2011-03-07213-2119/+2561
| | * | | | Added 4 mobile demos. Added links and descriptions for them.Jerome Pasion2011-03-03265-1/+19443
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-312-5/+7
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Fixed pro file syntax in demos/spectrumGareth Stockwell2011-03-291-3/+3
| | | |_|/ | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-03-271-2/+4
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Doc: QtDemo now gives error message when example doc cannot be loadedGeir Vattekar2011-03-071-2/+4
| | | |/
* | | | Merge ../qt-qml-stagingYann Bodson2011-03-291-1/+2
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-241-1/+2
| |\ \ \ | | |/ /
| | * | Changed maximum heap size for qmlflickr on Symbian.Laszlo Agocs2011-03-221-1/+2
| | |/
* | | Merge branch 'master' of ../qt-qml-stagingMartin Jones2011-02-1714-34/+45
|\ \ \ | |/ /
| * | Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-162-2/+8
| |\ \
| | * | demo browser: Verbose output about Zerocopy usageMarkus Goetz2011-02-042-2/+8
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-0412-32/+37
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-041-1/+1
| | |\
| | | * Fixed wrong casing of a Symbian library.axis2011-02-031-1/+1
| | * | Update Docs, Examples and Demos for new CreateObject overloadableChristopher Ham2011-01-285-9/+10
| | * | photoviewer needs QtQuick 1.1 for Image::cacheBea Lam2011-01-281-1/+1
| | * | Update demos following renaming of Image::cachedBea Lam2011-01-191-2/+2
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-19371-370/+421
| | |\ \ | | | |/
| | * | Introduce Qt.application.active propertyJoona Petrell2011-01-071-1/+1