summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | File shouldn't be in repositoryBea Lam2010-05-311-0/+0
* | | | Implement removeAt() for layout classes to clean up item removal. AlsoBea Lam2010-05-318-36/+70
* | | | Split graphicsLayouts example into qgraphicslinearlayout andBea Lam2010-05-3116-585/+755
* | | | Rename example layoutItem -> layoutitem and improve docsBea Lam2010-05-315-2/+2
| |/ / |/| |
* | | Add selection methods to TextEditWarwick Allison2010-05-305-0/+258
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-275-5/+5
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-269-10/+21
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-267-166/+172
| |\ \ \
| * | | | Don't display unnecessary copyright headers in docMartin Jones2010-05-265-5/+5
* | | | | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-279-10/+21
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Doc fixes, improvementsBea Lam2010-05-261-0/+0
| * | | | Unify naming of import plugin targetsJoona Petrell2010-05-268-10/+21
| | |/ / | |/| |
* | | | escape backslashesOswald Buddenhagen2010-05-263-5/+5
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-263-18/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-253-18/+9
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-243-18/+9
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-243-18/+9
| | | |\ \
| | | | * \ Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-241205-33107/+31902
| | | | |\ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-213-18/+9
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-203-18/+9
| | | | | |\ \ \
| | | | | | * | | Use QApplication::arguments() to check for command line argsHarald Fernengel2010-05-203-18/+9
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-2616-4/+51
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | geolocation (untested)Warwick Allison2010-05-251-0/+8
| * | | | | | | | Integrate some QML examples and demos into qtdemoAlan Alpert2010-05-2414-2/+40
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-241332-33109/+36944
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /