summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* 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-2 into 4.7David Boddie2010-05-2112-6/+95
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-2052-289/+169
| |\ \
| * | | 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
| * | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1987-2375/+2288
| * | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-199-249/+240
| * | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1917-471/+454
| * | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1963-1723/+1660
| * | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-195-139/+134
| * | | 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-1931-861/+830
| * | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1927-747/+720
| * | | 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-1931-845/+814
| * | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1982-2236/+2154
| * | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1926-728/+702
| * | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1919-519/+500
| * | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1928-776/+748
* | | | 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
| | | |/ | | |/|
* | | | 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
|\ \ \ | |/ /