summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-04134-142/+157
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-30133-142/+142
| |\
| | * Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-29133-142/+142
| * | Fix for bug QTMOBILITY-448 to list the default network configuration in Beare...lsgunda2010-09-291-0/+15
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-286-53/+72
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-261-1/+1
| |\
| | * Fix example.Michael Brasser2010-09-241-1/+1
| * | fix RSS listing examplePeter Hartmann2010-09-243-47/+59
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-222-5/+12
| |\
| | * Fix corkboards example for smaller screensJoona Petrell2010-09-211-4/+11
| | * Fix easing example having wrong contentHeightJoona Petrell2010-09-211-1/+1
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-221-2/+2
|\ \ \ | |/ /
| * | Fix audio glitches in the audiooutput example.Andrew den Exter2010-09-221-2/+2
| |/
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-09-22161-164/+264
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-21161-164/+264
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-201-1/+3
| | |\
| | | * Support multisampled pbuffers under Windows.Trond Kjernåsen2010-09-201-1/+3
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-171-1/+2
| | |\ \ | | | |/ | | |/|
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-171-1/+2
| | | |\
| | | | * Fix example after changes to font.letterSpacing.Yann Bodson2010-09-171-1/+2
| | * | | Merge commit 'staging-1/4.7' into fridayMorten Engvoldsen2010-09-172-7/+9
| | |\ \ \ | | | |/ /
| | | * | Make dialcontrol.qml usable on highres capacitive screenAlessandro Portale2010-09-161-0/+1
| | | * | Make easing.qml usable on highres capacitive screenAlessandro Portale2010-09-161-7/+8
| | | |/
| | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-16155-147/+231
| | |\ \ | | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-16150-147/+231
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-152-2/+2
| | | | |\
| | | | * | Doc: Some editing and tidying up.David Boddie2010-09-131-0/+4
| | | | * | Doc: Fixed text in license headers.David Boddie2010-09-13149-147/+227
| | | * | | Add missing images for dynamiclist example.Yann Bodson2010-09-155-0/+0
| | | | |/ | | | |/|
| | * | | Doc: Fixed a non-compiling example.David Boddie2010-09-161-0/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-161-1/+1
| | |\ \ \ | | | |/ /
| | | * | Remove debug, quiet warnings.Aaron McCarthy2010-09-131-1/+1
| | * | | Merge branch '4.7' of ../qt-doc-team into 4.7David Boddie2010-09-141-1/+1
| | |\ \ \ | | | |/ /
| | * | | Merge branch 'fixesfor4.7' into 4.7David Boddie2010-09-134-3/+9
| | |\ \ \
| | | * | | minor formatting fixRoland Wolf2010-09-082-2/+2
| | | * | | fix for compilation with namespaceRoland Wolf2010-09-082-2/+2
| | | * | | minor formatting fixRoland Wolf2010-09-082-2/+2
| | | * | | fix for compilation with namespaceRoland Wolf2010-09-084-6/+22
| | | | |/ | | | |/|
| | * | | compilation with namespaces was broken. fixedRoland Wolf2010-09-062-3/+1
* | | | | fix project name duplicates in generated projects.slnJoerg Bornemann2010-09-214-4/+6
|/ / / /
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1050-454/+257
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-071-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Some small Solaris fixes.Pierre Rossi2010-08-311-1/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-034-12/+6
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-034-12/+6
| | |\ \
| | | * | Doc: Fixed namespaced Qt build breakage in the model/view tutorial.David Boddie2010-09-034-12/+6
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-031-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fixed compilation of the modelview tutorial on Windows.Kim Motoyoshi Kalland2010-09-031-1/+1
| | |/ /
| * | | Fix the same bug that was in the demo samegame, in the tutorial versionAlan Alpert2010-09-031-2/+2
| |/ /
| * | QString usage cleanupsOswald Buddenhagen2010-09-013-5/+5