summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* Fixed `make install' for qmediaplayer demo.Rohan McGovern2010-06-071-1/+1
* Standalone Qml demos for FluidlauncherAlessandro Portale2010-06-0331-0/+725
* Fix some bugs in the QML Web Browser buttonsAlan Alpert2010-05-312-1/+2
* Fix zoom bug in QML Web Browser demoAlan Alpert2010-05-312-3/+3
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-303-10/+17
|\
| * Some tweaks on the QML-enhanced QtDemoAlan Alpert2010-05-303-10/+17
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-291-0/+1
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-271-0/+1
| |\ \ | | |/ | |/|
| | * Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-2712-11/+26
| | |\
| | * \ Merge branch '4.7' of scm.dev.troll.no:qt/qt into 4.7Shane Kearns2010-05-2617-48/+422
| | |\ \
| | * | | Make link on linux/symbianThomas Zander2010-05-251-0/+1
* | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-2830-731/+742
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-2730-731/+742
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Removed unnecessary PlatSec capabilities from spectrum demo DLLGareth Stockwell2010-05-262-2/+2
| | * | | Added missing PlatSec capabilities to spectrum demo DLLGareth Stockwell2010-05-261-0/+1
| | * | | Build fix for spectrum demo when -qtnamespace is usedGareth Stockwell2010-05-259-24/+27
| | * | | Fixed license headers in spectrum demoGareth Stockwell2010-05-2528-688/+716
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-2712-11/+26
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-273-5/+5
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | escape backslashesOswald Buddenhagen2010-05-261-2/+2
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2511-9/+24
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2411-9/+24
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-241-1/+1
| | | |\ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2111-9/+24
| | | |\ \ \ \
| | | | * | | | Examples: Fix compilation with namespace.ck2010-05-209-1/+22
| | | | * | | | Use QApplication::arguments() to check for command line argsHarald Fernengel2010-05-202-8/+2
* | | | | | | | Tweak aesthetics of QML viewer inside QtDemoAlan Alpert2010-05-278-175/+118
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-263-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-262-4/+4
| |\ \ \ \ \ \
| | * | | | | | Unify naming of import plugin targetsJoona Petrell2010-05-262-4/+4
| * | | | | | | Fix TextEdit clipping when not wrapped. Rename most-useful-wrap-mode to "Wrap".Warwick Allison2010-05-261-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-253-14/+19
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-253-14/+19
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Removed DEPLOYMENT from demos/spectrum/spectrum.proGareth Stockwell2010-05-211-13/+0
| | * | | | Install source for spectrum demoGareth Stockwell2010-05-213-0/+18
| | * | | | Fixed path for copying launcher script for spectrum demoGareth Stockwell2010-05-211-1/+1
* | | | | | License header.Warwick Allison2010-05-252-0/+82
* | | | | | Integrate some QML examples and demos into qtdemoAlan Alpert2010-05-2411-29/+316
|/ / / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2160-0/+2460
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add license headers for .qml files.Jason McDonald2010-05-2160-0/+2460
| | |/ / | |/| |
* | | | Fix shadow building of spectrum demoRhys Weatherley2010-05-211-1/+1
|/ / /
* | | Some minor example fixesAlan Alpert2010-05-201-0/+2
| |/ |/|
* | Rename Component::errorsString() -> errorString() (and also forBea Lam2010-05-202-4/+4
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-193-28/+32
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-193-28/+32
| |\ \
| | * | DocumentationYann Bodson2010-05-181-0/+16
| | * | Photoviewer example fixes.Yann Bodson2010-05-182-28/+16
* | | | Merge commit 'remotes/origin/4.7' into symbian47Thomas Zander2010-05-19107-1191/+13678
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-1912-1285/+0
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-1867-561/+578
| | |\ \ \ | | | |/ /