summaryrefslogtreecommitdiff
path: root/examples
AgeCommit message (Expand)AuthorFilesLines
2010-06-01Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System7-10/+14
2010-05-31Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System1-1/+1
2010-05-31Doc: Fixed an off-by-one error in an example.David Boddie1-1/+1
2010-05-31Various doc fixes and improvementsBea Lam5-1/+5
2010-05-31Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison22-753/+957
2010-05-31Simplify selection setting. Make TextInput more like TextEdit.Warwick Allison2-9/+9
2010-05-31Fix exampleBea Lam1-1/+1
2010-05-31Rename QGraphics...Layout classes/QML items to Graphics...LayoutBea Lam8-64/+64
2010-05-31File shouldn't be in repositoryBea Lam1-0/+0
2010-05-31Implement removeAt() for layout classes to clean up item removal. AlsoBea Lam8-36/+70
2010-05-31Split graphicsLayouts example into qgraphicslinearlayout andBea Lam16-585/+755
2010-05-31Rename example layoutItem -> layoutitem and improve docsBea Lam5-2/+2
2010-05-31Add selection methods to TextEditWarwick Allison5-0/+258
2010-05-27Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System5-5/+5
2010-05-27Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy9-10/+21
2010-05-27Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones9-10/+21
2010-05-26escape backslashesOswald Buddenhagen3-5/+5
2010-05-26Doc fixes, improvementsBea Lam1-0/+0
2010-05-26Unify naming of import plugin targetsJoona Petrell8-10/+21
2010-05-26Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System3-18/+9
2010-05-26Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam16-4/+51
2010-05-26Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones7-166/+172
2010-05-26Don't display unnecessary copyright headers in docMartin Jones5-5/+5
2010-05-25Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System3-18/+9
2010-05-25geolocation (untested)Warwick Allison1-0/+8
2010-05-24Integrate some QML examples and demos into qtdemoAlan Alpert14-2/+40
2010-05-24Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert1332-33109/+36944
2010-05-24Fix typoAlan Alpert1-1/+1
2010-05-24Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System3-18/+9
2010-05-24Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System3-18/+9
2010-05-24Doc fixesYann Bodson1-2/+2
2010-05-24Clean up and don't allow clicks on already filled placesBea Lam3-139/+149
2010-05-24Clean up project files for c++ examplesBea Lam4-28/+23
2010-05-24Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy1205-33107/+31902
2010-05-22Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System126-0/+5040
2010-05-21Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie12-6/+95
2010-05-21Add license headers for .qml files.Jason McDonald126-0/+5040
2010-05-21Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System3-18/+9
2010-05-20Make dynamicscene example embeddeable in another graphics sceneAlan Alpert1-1/+1
2010-05-20Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System3-18/+9
2010-05-20Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie52-289/+169
2010-05-20Some minor example fixesAlan Alpert9-0/+78
2010-05-20Use QApplication::arguments() to check for command line argsHarald Fernengel3-18/+9
2010-05-20Fix incorrect mergeAlan Alpert1-1/+1
2010-05-20Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert8-17/+21
2010-05-20Rename Component::errorsString() -> errorString() (and also forBea Lam4-7/+7
2010-05-20Fixes for docs, example codeBea Lam4-11/+10
2010-05-20Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System44-178/+53
2010-05-19Doc: Updated example license to three clause BSD license.David Boddie28-768/+740
2010-05-19Doc: Updated example license to three clause BSD license.David Boddie24-654/+630