summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge remote branch 'origin/4.7' into qml-4.7Rohan McGovern2010-06-2213-14/+14
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-222-2/+0
| |\ \
| | * | Removed unnecessary data_caging_paths.prf loading from applicationsMiikka Heikkinen2010-06-222-2/+0
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-227-7/+7
| |\ \ \ | | |/ /
| | * | Fix WebKit declarative examples (second try)Simon Hausmann2010-06-221-1/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-226-6/+6
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-226-6/+6
| | | |\ \
| | | | * | Fix examplesSimon Hausmann2010-06-216-6/+6
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-225-6/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-215-6/+8
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Fix example compile and runtime warnings, webkit examples not built.Friedemann Kleint2010-06-185-6/+8
| | | |/ /
* | | | | Remove transparent.qml example for now, until QTBUG-11591 is fixedBea Lam2010-06-221-55/+0
* | | | | qmldir no longer necessaryBea Lam2010-06-221-4/+0
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2244-392/+244
|\ \ \ \ | |/ / / |/| | |
| * | | Rename example: edit -> textselectionBea Lam2010-06-226-0/+16
| * | | Clean up some examplesBea Lam2010-06-2237-374/+195
| * | | Rename example and add minor improvementsBea Lam2010-06-221-17/+32
| * | | Spelling fixBea Lam2010-06-221-1/+1
* | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-211-0/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-161-0/+5
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-06-162-2/+28
| | |\
| | * | AudioInput example; disconnect from the built-in device when changing mode.Justin McPherson2010-06-161-0/+5
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-218-21/+27
|\ \ \ \
| * | | | ListView doc improvements and examples clean upBea Lam2010-06-188-21/+27
| |/ / /
* | | | Allow things that load SameGame to disable the Quit buttonAlan Alpert2010-06-211-0/+1
|/ / /
* | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-162-2/+28
|\ \ \
| * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-162-2/+28
| |\ \ \ | | | |/ | | |/|
| | * | VideoWidget exampleKurt Korbatits2010-06-162-2/+28
| | |/
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-166-0/+0
|\ \ \ | |/ / |/| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-166-0/+0
| |\ \
| | * | Attribute change to allow inclusion of image files.Toby Tomkins2010-06-166-0/+0
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-168-1/+90
|\ \ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-158-1/+90
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | use "win32-g++*" scope to match all MinGW makespecsMark Brand2010-06-101-1/+1
| | * | | Merge commit 'refs/merge-requests/2408' of git://gitorious.org/qt/qt into int...David Boddie2010-06-072-0/+84
| | |\ \ \
| | | * | | * Add Japanese tutorial documentsTakumi ASAKI2010-06-072-0/+84
| | | |/ /
| | * | | Fix in Addressbook tutorialRobert Loehning2010-06-045-0/+5
| | |/ /
* | | | Clean up list examplesBea Lam2010-06-169-348/+240
|/ / /
* | | Move listview/itemlist.qml to a separate visualitemmodel exampleBea Lam2010-06-118-0/+16
* | | Add an example of animated item add/remove in ListViewMartin Jones2010-06-081-0/+33
* | | Add image example.Bea Lam2010-06-074-0/+142
* | | Improve input panel handling in declarative demos and examplesJoona Petrell2010-06-036-6/+32
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-017-10/+14
|\ \
| * | Various doc fixes and improvementsBea Lam2010-05-315-1/+5
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-3122-753/+957
| |\ \
| * | | Simplify selection setting. Make TextInput more like TextEdit.Warwick Allison2010-05-312-9/+9
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-311-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Doc: Fixed an off-by-one error in an example.David Boddie2010-05-311-1/+1
* | | | Fix exampleBea Lam2010-05-311-1/+1
* | | | Rename QGraphics...Layout classes/QML items to Graphics...LayoutBea Lam2010-05-318-64/+64