summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Fixing merge conflicts.Martin Smith2010-07-1311-123/+108
|\
| * Follow -> Behaviormae2010-07-087-51/+53
| * Extend QDeclarativeImageProvider to support QPixmap loading andBea Lam2010-07-082-62/+39
| * Added QDeclarativeSpringAnimationmae2010-07-071-9/+10
| * doc improvementsBea Lam2010-07-061-1/+6
* | Compile fix for bearermonitor exampleDominik Holland2010-07-122-1/+49
* | Doc: Fixing typo - background file nameMorten Engvoldsen2010-07-081-1/+1
|/
* Add abstractitemmodel example, and fix some model docsBea Lam2010-07-018-6/+304
* docs - quote code with snippets, other improvementsBea Lam2010-07-015-21/+31
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-309-20/+27
|\
| * Examples clean upBea Lam2010-06-287-13/+15
| * Improve appearance when scalingBea Lam2010-06-281-6/+11
| * Fix import path in cppextensions declarative example.Christian Kamm2010-06-241-1/+1
* | Fixed deployment paths for the symbian/linux-armcc mkspec.axis2010-06-292-2/+2
|/
* Cherry pick fix for QTMOBILITY-253 from Qt Mobility.Aaron McCarthy2010-06-245-5/+5
* Cherry pick fix for MOBILITY-1047 from Qt Mobility.Aaron McCarthy2010-06-241-2/+9
* Merge bearermanagement changes from Qt Mobility.Aaron McCarthy2010-06-243-3/+3
* Merge remote branch 'origin/4.7' into qml-4.7Rohan McGovern2010-06-2213-14/+14
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-222-2/+0
| |\
| | * Removed unnecessary data_caging_paths.prf loading from applicationsMiikka Heikkinen2010-06-222-2/+0
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-227-7/+7
| |\ \ | | |/
| | * Fix WebKit declarative examples (second try)Simon Hausmann2010-06-221-1/+1
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-226-6/+6
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-226-6/+6
| | | |\
| | | | * Fix examplesSimon Hausmann2010-06-216-6/+6
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-225-6/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-215-6/+8
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix example compile and runtime warnings, webkit examples not built.Friedemann Kleint2010-06-185-6/+8
| | | |/
* | | | Remove transparent.qml example for now, until QTBUG-11591 is fixedBea Lam2010-06-221-55/+0
* | | | qmldir no longer necessaryBea Lam2010-06-221-4/+0
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2244-392/+244
|\ \ \ | |/ / |/| |
| * | Rename example: edit -> textselectionBea Lam2010-06-226-0/+16
| * | Clean up some examplesBea Lam2010-06-2237-374/+195
| * | Rename example and add minor improvementsBea Lam2010-06-221-17/+32
| * | Spelling fixBea Lam2010-06-221-1/+1
* | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-211-0/+5
|\ \ \ | |/ / |/| |
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-161-0/+5
| |\ \ | | |/ | |/|
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-06-162-2/+28
| | |\
| | * | AudioInput example; disconnect from the built-in device when changing mode.Justin McPherson2010-06-161-0/+5
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-218-21/+27
|\ \ \ \
| * | | | ListView doc improvements and examples clean upBea Lam2010-06-188-21/+27
| |/ / /
* | | | Allow things that load SameGame to disable the Quit buttonAlan Alpert2010-06-211-0/+1
|/ / /
* | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-162-2/+28
|\ \ \
| * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-162-2/+28
| |\ \ \ | | | |/ | | |/|
| | * | VideoWidget exampleKurt Korbatits2010-06-162-2/+28
| | |/
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-166-0/+0
|\ \ \ | |/ / |/| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-166-0/+0
| |\ \
| | * | Attribute change to allow inclusion of image files.Toby Tomkins2010-06-166-0/+0
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-168-1/+90
|\ \ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-158-1/+90
| |\ \ \ \ | | |/ / / | |/| | |