summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* 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.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
| |\ \ \ | | |/ /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-181-0/+5
| |\ \ \ | | |_|/ | |/| |
| | * | Fix 'chapter5_plugins.dll.sym contains initialized writable data'Alessandro Portale2010-05-171-0/+5
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1928-768/+740
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1924-654/+630
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-19106-2926/+2820
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1925-689/+664
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-196-168/+162
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1958-1600/+1542
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1987-2395/+2308
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1914-380/+366
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-199-245/+236
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1927-739/+712
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1931-839/+808
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1918-494/+476
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1923-625/+602
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-196-162/+156
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-197-191/+184
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1912-348/+336
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-196-166/+160
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1936-988/+952
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-193-83/+80
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1962-1702/+1640
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1994-2570/+2476
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1914-386/+372
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1921-577/+556
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1920-552/+532
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1911-303/+292
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1916-446/+430