summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-2523-60/+728
|\
| * Remove accidentially committed .qmlproject.user file, ignore this filetypeDaniel Molkentin2010-10-221-41/+0
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-191-16/+18
| |\
| | * Tic-tac-toe: Fix z-order of status text.Daniel Molkentin2010-10-191-16/+18
| * | 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-1420-2/+709
| |\
| | * Added missing QtWebKit example files and some whitespace fixes.Jerome Pasion2010-10-095-47/+198
| | * Doc: Fixing bug - line too long and not visible. Breaking the line in twoMorten Engvoldsen2010-10-071-1/+2
| | * Added a project file for the Getting Started with QML and changed theJerome Pasion2010-10-062-0/+4
| | * Added the QtWebKit bridge Image Analyzer example.Jerome Pasion2010-10-0414-0/+551
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-04134-142/+157
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-309-57/+79
| | |\ \
| | * | | Doc: Fixed a memory leak in the undo example.David Boddie2010-09-221-1/+1
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-152-1/+109
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-10-141-0/+108
| |\ \ \ \
| | * | | | Add new behavior example.Yann Bodson2010-10-131-0/+108
| | | |_|/ | | |/| |
| * | | | Fix samegame tutorial jsAlan Alpert2010-10-141-1/+1
| |/ / /
* | | | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-0813-17/+17
* | | | 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