summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-1913-88/+122
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-03-185-3/+16
| |\
| | * Added close button to Anomaly demo browserMiikka Heikkinen2010-03-165-3/+16
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-164-4/+4
| |\ \
| * | | Fix build break caused by undefined symbol SetDialogPreferenceMiikka Heikkinen2010-03-114-4/+4
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-1179-208/+203
| |\ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-0122-114/+121
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-2347-79/+1341
| |\ \ \ \ \
| * | | | | | Changed fluidlauncher deployment to cope with Symbian makefile systemaxis2010-02-231-77/+93
| * | | | | | Implemented recursive "sis" target and enabled sis_targets feature.axis2010-02-232-1/+6
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-191-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-16149-3/+4886
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-163-6/+13
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-124-6/+15
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | use the proper QMake option to find a shared header fileThomas Zander2010-02-044-4/+4
| * | | | | | | | | Fix linking for armlinkThomas Zander2010-02-041-3/+3
* | | | | | | | | | Remove incorrect semi-colons after Q_PROPERTYThiago Macieira2010-03-181-9/+9
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-154-4/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Fix build break caused by undefined symbol SetDialogPreferenceMiikka Heikkinen2010-03-104-4/+4
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-081-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fix to mainwindow demoThierry Bastian2010-03-081-1/+1
* | | | | | | | | Use a better method for installing declarative demos.Rohan McGovern2010-03-087-76/+16
* | | | | | | | | Fixed declarative demos not being installed.Rohan McGovern2010-03-088-0/+93
* | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-061-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | SqlBrowser not respecting casings.Bill King2010-03-041-1/+1
* | | | | | | | 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