summaryrefslogtreecommitdiffstats
path: root/examples/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-279-10/+21
|\
| * Doc fixes, improvementsBea Lam2010-05-261-0/+0
| * Unify naming of import plugin targetsJoona Petrell2010-05-268-10/+21
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-267-166/+172
|\|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-2616-4/+51
| |\
| * | 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
* | | Don't display unnecessary copyright headers in docMartin Jones2010-05-265-5/+5
| |/ |/|
* | 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-24208-2211/+7170
|\ \
| * | Doc fixesYann Bodson2010-05-241-2/+2
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-22126-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
| |\|
| * | 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-1982-2236/+2154
* | | | Fix typoAlan Alpert2010-05-241-1/+1
| |_|/ |/| |
* | | 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
|\ \ \ | | |/ | |/|
| * | 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-2044-178/+53
| |\ \
| * \ \ 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
* | | | Fix dynamicscene exampleAlan Alpert2010-05-193-5/+16
| |_|/ |/| |
* | | 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
|/ /
* / Compile fixes.ck2010-05-171-0/+0
|/
* Move xmldata example into rssnews demo.Yann Bodson2010-05-173-146/+0
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-17381-218/+232
|\
| * Add missing .proBea Lam2010-05-171-0/+5
| * Restructure the examples. They are now organized into variousBea Lam2010-05-17380-218/+227
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-142-2/+14
|\ \ | |/ |/|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Peter Yard2010-05-1495-565/+1871
| |\
| * | Added snippet labels to QML Dial example.Peter Yard2010-05-142-2/+14
* | | Rename QML Runtime (executable) to QML LauncherKai Koehne2010-05-141-1/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-132-2/+2
|\ \ \ | | |/ | |/|
| * | Flickable small API changes.Yann Bodson2010-05-122-2/+2
* | | Add an example spinner.Martin Jones2010-05-136-0/+60
|/ /
* | Clean upBea Lam2010-05-121-1/+0
* | Removed multimedia effects from tvtennis declarative exampleLeonardo Sobral Cunha2010-05-103-8/+0
* | There is no Qt.widgetsWarwick Allison2010-05-101-1/+0
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-0724-219/+247
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-0717-48/+41
| |\ \
| | * | More cleanupYann Bodson2010-05-065-15/+15
| | * | CleanupYann Bodson2010-05-063-5/+5