summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-2/+3
|\
| * Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-121-2/+3
* | Chip demo: makes scene interaction easier.Yoann Lopes2010-11-152-12/+74
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-124-7/+3
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-051-2/+1
| |\
| | * Fix minehunt.pro (minehunt is no longer a plugin)Bea Lam2010-11-051-2/+1
| * | Don't allow flagging of flipped tiles in MinehuntAlan Alpert2010-11-051-1/+1
| * | Remove Snake demo from QtDemoAlan Alpert2010-11-051-1/+0
| * | Fix samegame text input focusAlan Alpert2010-11-051-3/+1
| |/
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-301-90/+108
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-301-90/+108
| |\ \
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-291-90/+108
| | |\ \
| | | * \ Merge remote branch 'scm/qt/master'Tor Arne Vestbø2010-10-281-1/+3
| | | |\ \
| | | * | | samegame: white spacehjk2010-10-281-90/+108
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-3014-482/+403
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-2914-482/+403
| |\ \ \ \
| | * | | | Play whole file in spectrum analyzer demoGareth Stockwell2010-10-2911-467/+369
| | * | | | Do not unnecessarily reset state of spectrum demoGareth Stockwell2010-10-293-45/+61
| | * | | | Set SpectrumAnalyserThread parent to 0 before calling moveToThread()Gareth Stockwell2010-10-291-0/+2
| | * | | | Making the buttons less finger unfriendlyAlessandro Portale2010-10-282-3/+4
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-291-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Missing part of 64a05cfa97b1192ac247558c0601ba0e4ec464c9Alan Alpert2010-10-281-1/+1
| |/ / /
* | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2010-10-291-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2622-136/+169
| |\ \ \ | | | |/ | | |/|
| * | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2225-79/+116
| |\ \ \
| * \ \ \ Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-10-221-1/+1
| |\ \ \ \
| | * | | | Lighthouse: initial COCOA pluginJørgen Lind2010-10-201-1/+1
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-271-1/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Fix empty mifconv TARGETFILE in some edge cases.Miikka Heikkinen2010-10-261-1/+3
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-263-35/+46
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-263-35/+46
| |\ \ \ \
| | * | | | qmediaplayer: added command-line switch for initial volumeGareth Stockwell2010-10-253-35/+46
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-2512-12/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-2512-12/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fixed many spelling errors.Rohan McGovern2010-10-2512-12/+12
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-252-79/+90
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-252-79/+90
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Demo Spectrum wav data size is not calculated correctlyJustin McPherson2010-10-132-79/+90
| | * | | | qmediaplayer: show buffer status of 0%Gareth Stockwell2010-10-081-1/+1
| | * | | | Spectrum demo: fixed installationGareth Stockwell2010-07-062-9/+10
| | * | | | Spectrum build: fixed DLL rpathGareth Stockwell2010-07-062-60/+3
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-256-10/+21
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-191-1/+1
| |\ \ \ \
| | * | | | Fix Twitter demo's list view for devicesJoona Petrell2010-10-191-1/+1
| * | | | | Only add ICON for application projects in symbianpkgrules.priMiikka Heikkinen2010-10-191-1/+1
| |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-151-5/+5
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-141-5/+5
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-111-5/+5
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-10-079-13/+41
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-061-5/+5
| | | | |\ \ \ \ \