summaryrefslogtreecommitdiffstats
path: root/demos
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-03-052-2/+1
|\
| * Doc: Enabled the context menu in the spreadsheet demo.David Boddie2010-03-041-0/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-041-2/+0
| |\
| | * Remove the OBJECTS_DIR variable assignment from some projets in Qt.Jocelyn Turcotte2010-03-041-2/+0
* | | Merge branch '4.7' of ../../qt-qml/4.7 into 4.7Justin McPherson2010-03-0468-186/+114
|\ \ \ | |/ / |/| |
| * | Fix Samegame.Michael Brasser2010-03-031-1/+1
| * | Add minehunt READMEAlan Alpert2010-03-021-0/+3
| * | Refactor demosAlan Alpert2010-03-0236-5/+15
| * | Rewrite Minehunt demo to use the runtime.Alan Alpert2010-03-0218-148/+62
| * | Fix zooming (broke with transformOrigin default change).Warwick Allison2010-03-021-0/+1
| * | Merge branch 'master' into 4.7Warwick Allison2010-03-024-1/+4
| |\ \
| | * | Move WebView to an extension plugin.Warwick Allison2010-03-023-0/+3
| | * | follow syntax changeWarwick Allison2010-03-021-1/+1
| * | | Merge branch 'master' into 4.7Aaron Kennedy2010-03-0217-31/+28
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-03-023-21/+24
| | |\
| | * | Make "on" syntax mandatory for value sources and interceptorsAaron Kennedy2010-03-0217-30/+29
* | | | Added playlist playback modes combo box to player demoDmytro Poplavskiy2010-03-042-1/+30
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-012-1/+3
|\ \ \ | |_|/ |/| |
| * | Interview Demo: Fix warning about pixmap leak on X11.Friedemann Kleint2010-03-012-1/+3
* | | Fix minehunt demoAlan Alpert2010-03-012-7/+11
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-03-0110-80/+72
|\ \ \ | |/ /
| * | Fix position of image in detail view in flickr-mobileYann Bodson2010-03-011-4/+1
| |/
| * Set correct transformOrigin.Martin Jones2010-03-011-0/+1
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-03-011-3/+1
| |\
| | * Fix position of image in detail view.Martin Jones2010-03-011-3/+1
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-261-14/+0
| |\ \ | | |/ | |/|
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-261-14/+0
| | |\
| | | * Improvements to itemview keypad navigation in S60.Janne Anttila2010-02-251-14/+0
| * | | Change Connection syntax as per QT-2822.Warwick Allison2010-02-263-9/+9
| * | | Test, demo, and work-around bug QTBUG-8535Warwick Allison2010-02-262-18/+28
| * | | Renamed Flickable viewportXXX properties contentXXXMartin Jones2010-02-265-30/+30
* | | | Make Minehunt demo compile.Alan Alpert2010-03-011-13/+17
|/ / /
* | | Recfactor in declarative snake demoLeonardo Sobral Cunha2010-02-251-2/+2
* | | Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-242-1/+13
|\ \ \ | |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-232-1/+13
| |\ \
| | * | Player demo updated with more user-friendly previous button behaviour.Nicholas Young2010-02-232-1/+13
* | | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDec...Warwick Allison2010-02-241-8/+8
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2318-29/+27
|\ \ \ \
| * | | | Updates all qml examples/demos to use the easing curve value type syntaxLeonardo Sobral Cunha2010-02-2317-26/+26
| * | | | Remove QmlView::execute(). QmlView::setSource() does it all now.Martin Jones2010-02-231-3/+1
| |/ / /
* | | | Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls.Warwick Allison2010-02-231-1/+2
|/ / /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-2218-23/+23
|\ \ \ | |/ / |/| |
| * | Rename MouseRegion -> MouseAreaMartin Jones2010-02-2218-23/+23
* | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-2036-46/+1280
|\ \ \ | |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-1924-46/+59
| |\ \
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-181-1/+1
| | |\ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-1820-29/+29
| | |\ \ \
| | | * | | Fix example after introduction of RotationAnimation.Michael Brasser2010-02-182-2/+2
| | | * | | Get rid of the matchProperties/properties distinction, as itMichael Brasser2010-02-1818-27/+27
| | * | | | QmlView API review. See QmlChanges.txt for details.Martin Jones2010-02-182-11/+8
| | |/ / /