summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-081-0/+1
|\
| * needs focusWarwick Allison2010-04-081-0/+1
* | Replace Text::wrap property with Text::wrapMode enumeration.Martin Jones2010-04-085-8/+10
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-061-1/+1
|\
| * Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errorsJohan Hauan2010-04-061-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-061-0/+27
|\ \ | |/ |/|
| * Labs (experimental) Gesture support.Warwick Allison2010-04-061-0/+27
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-021-0/+3
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-011-0/+3
| |\ \
| | * \ Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-0126-74/+81
| | |\ \ | | | |/
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-011-0/+3
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-311-0/+3
| | | |\ \
| | | | * \ Merge commit 'origin/4.7' into symbian47Thomas Zander2010-03-317-328/+2
| | | | |\ \
| | | | * | | Work around bad naming of exported class in symbian sdk causing conflictThomas Zander2010-03-301-0/+3
* | | | | | | Fix some more Q_PROPERTY followed by semi-colonThiago Macieira2010-04-025-8/+8
|/ / / / / /
* | | | | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-0129-93/+96
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-0126-74/+81
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Make QML 'hello world' tutorial less confusing.Yann Bodson2010-04-013-20/+19
| | * | | | Doc improvements, fixesBea Lam2010-04-0113-31/+31
| | * | | | Fix imageprovider example compilation on Symbian armJoona Petrell2010-04-011-0/+4
| | * | | | Fix plugin example compilation on Symbian armJoona Petrell2010-04-012-12/+13
| | * | | | Renamed widgets example to proxywidgets to avoid conflictsJoona Petrell2010-04-017-11/+14
| | |/ / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-313-19/+15
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-303-19/+15
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-03-30425-1243/+16761
| | | |\ \
| | | | * \ Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-301-1/+2
| | | | |\ \ | | | | | |/
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-303-19/+15
| | | | |\ \
| | | | | * \ Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-257-10/+36
| | | | | |\ \
| | | | | * | | Fix warnings and build on mingwThierry Bastian2010-03-253-19/+15
* | | | | | | | Fix build on WinCE and Symbian: .pro file must match dir name.Thiago Macieira2010-04-011-0/+0
* | | | | | | | Fix compilation: no semi-colon after Q_ENUM or Q_PROPERTYThiago Macieira2010-04-011-1/+1
|/ / / / / / /
* | | | | | | Minor cleanup.Yann Bodson2010-03-312-6/+5
* | | | | | | Improve flipable example.Yann Bodson2010-03-317-32/+46
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-315-27/+34
|\ \ \ \ \ \ \
| * | | | | | | Update examples/declarative.proYann Bodson2010-03-311-1/+1
| * | | | | | | Declarative examples cleanup.Yann Bodson2010-03-313-25/+31
| |/ / / / / /
| * | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-03-301-1/+2
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-03-301-1/+2
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-3024-316/+472
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | * | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-292-1/+3
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | / | | | | |_|_|/ | | | |/| | |
| | | | * | | Changed pkg_prerules to not use default_deployment for vendor IDMiikka Heikkinen2010-03-261-1/+2
* | | | | | | example of WebView onAlert, and of popups in general.Warwick Allison2010-03-312-0/+63
|/ / / / / /
* | | | | | Move basic focusscope examples into auto tests.Yann Bodson2010-03-306-327/+0
|/ / / / /
* | | | | Change and rename qml EaseFollow to SmoothedAnimationLeonardo Sobral Cunha2010-03-301-1/+2
| |_|/ / |/| | |
* | | | Update examples/declarative.proYann Bodson2010-03-292-2/+7
* | | | Remove colorbrowser exampleYann Bodson2010-03-295-311/+0
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2912-0/+381
|\ \ \ \
| * | | | Add focus and key navigation example.Yann Bodson2010-03-298-0/+209
| * | | | Add example on how to use Qt widgets in qml.Yann Bodson2010-03-294-0/+172
* | | | | Update for import dir and imageProvider changes.Warwick Allison2010-03-292-3/+14
|/ / / /