summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-3122-753/+957
|\
| * 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
* | Simplify selection setting. Make TextInput more like TextEdit.Warwick Allison2010-05-312-9/+9
|/
* 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
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Doc fixesYann Bodson2010-05-241-2/+2
| | |/ / / / /
| * | | | | | Fix typoAlan Alpert2010-05-241-1/+1
| | |/ / / / | |/| | | |
* | | | | | Clean up and don't allow clicks on already filled placesBea Lam2010-05-243-139/+149
* | | | | | Clean up project files for c++ examplesBea Lam2010-05-244-28/+23
| |/ / / / |/| | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-21126-0/+5040
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add license headers for .qml files.Jason McDonald2010-05-21126-0/+5040
| |/ / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-2112-6/+95
|\ \ \ \ | |/ / /
| * | | Make dynamicscene example embeddeable in another graphics sceneAlan Alpert2010-05-201-1/+1
| * | | Some minor example fixesAlan Alpert2010-05-209-0/+78
| |/ /
| * | Fix incorrect mergeAlan Alpert2010-05-201-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-208-17/+21
| |\ \ | | |/
| * | Fix dynamicscene exampleAlan Alpert2010-05-193-5/+16
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-2052-289/+169
|\ \ \ | | |/ | |/|
| * | Rename Component::errorsString() -> errorString() (and also forBea Lam2010-05-204-7/+7
| * | Fixes for docs, example codeBea Lam2010-05-204-11/+10
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1944-178/+53
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1944-178/+53
| | |\
| | | * Remove image example (covered in class docs)Bea Lam2010-05-199-175/+0
| | | * Add missing .qmlproject filesBea Lam2010-05-193-0/+48
| | | * Rename some examples: proxyviewer -> networkaccessmanagerfactory,Bea Lam2010-05-1833-19/+21
| * | | Merge commit 'remotes/origin/4.7' into symbian47Thomas Zander2010-05-194-290/+439
| |\ \ \ | | |/ /
generated by cgit v0.12 at 2024-11-07 19:48:20 (GMT)