summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-0461-61/+61
|\
| * Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-2961-61/+61
* | Make sure the plugin target name is windows compliantThierry Bastian2010-10-011-0/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1038-499/+417
|\ \ | |/
| * Re-add quit button to declarative Twitter demoJoona Petrell2010-09-091-1/+12
| * Remove some .pro statements left behind after IAP usage cleanupMiikka Heikkinen2010-09-082-4/+0
| * Fix text size issues for high ppi displaysAlessandro Portale2010-09-075-7/+7
| * Increase maximum heap size of minehunt demo to fix crashing on SymbianJoona Petrell2010-09-071-0/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-061-1/+1
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-09-0217-464/+335
| | |\
| | * | Doc: Changed the default URL to avoid a Flash plugin crash on x86-64.David Boddie2010-09-021-1/+1
| * | | Ensure slider is updated when screen size changes.Martin Jones2010-09-062-6/+38
| | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-09-0227-487/+367
| |\ \
| | * | QString usage cleanupsOswald Buddenhagen2010-09-011-1/+1
| | * | Updated Twitter demo in response to the new Twitter oauth requirementJens Bache-Wiig2010-08-3113-459/+330
| | |/
| | * Revert "Add 'cached' property to Image."Yann Bodson2010-08-311-2/+2
| | * Add 'cached' property to Image.Yann Bodson2010-08-311-2/+2
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-3012-9/+34
| | |\
| | | * Remove debug.Martin Jones2010-08-301-1/+0
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-308-4/+17
| | | |\
| | | | * Fix application exiting in embedded qml examplesJoona Petrell2010-08-308-4/+17
| | | * | Snake: Don't use Behavior with states.Martin Jones2010-08-304-5/+18
| | | |/
| | * | Text is inputted on top of existing text in anomalySami Merila2010-08-301-18/+2
| | |/
| * | Remove extra stringsAlan Alpert2010-09-021-3/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-08-2617-21/+93
| |\ \ | | |/
| * | Maintain high score name dialog length, as well as name.Alan Alpert2010-08-262-1/+3
* | | State handling cleanupmae2010-09-093-21/+50
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-3017-21/+93
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-08-2611-20/+92
| |\ \
| | * | Add quit buttons to declarative demosJoona Petrell2010-08-2611-20/+92
| | |/
| * | Make declarative examples a bit more qt-like.Yann Bodson2010-08-267-1/+1
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-2514-211/+290
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-201-2/+2
| |\
| | * Use Ctrl rather than Alt for switching tabs in the demo browserTor Arne Vestbø2010-08-201-2/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-08-206-145/+215
| |\ \
| | * | Fix minehunt demo for SymbianJoona Petrell2010-08-206-145/+215
| * | | Allow QML Quit buttons to work inside QtDemo.Alan Alpert2010-08-203-2/+10
| |/ /
| * | Add a quit button to declarative examples in QtDemoAlan Alpert2010-08-201-33/+25
| * | Without Declarative, still build and run QtDemoAlan Alpert2010-08-194-13/+33
| |/
| * Fix game could not be restartedmae2010-08-162-16/+5
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-1321-114/+129
|\ \ | |/
| * Fixed build failureGareth Stockwell2010-08-123-4/+4
| * Do not include Spectrum Analyzer demo in static buildsGareth Stockwell2010-08-112-1/+5
| * Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-094-4/+4
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-041-1/+1
| |\
| | * Fix the remote command delimiter, this has cahnged at some point.kh12010-08-041-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-041-2/+15
| |\ \ | | |/ | |/|
| | * Snake game cannot be restartedmae2010-08-031-2/+15
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-031-2/+2
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-031-2/+2
| | |\