summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-211-26/+12
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-162-0/+4
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-161-0/+2
| |\
| | * Move knowledge of QGraphicsObject out of qml engineAaron Kennedy2010-06-161-0/+2
| * | Minor demo fixesAlan Alpert2010-06-161-0/+2
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-151-1/+0
|\ \ | |/ |/|
| * Demos: Fix compilation with namespace.ck2010-06-101-1/+0
* | Add go button to webbrowser example.Yann Bodson2010-06-105-4/+36
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-0811-13/+44
|\ \ | |/ |/|
| * Fix snake demomae2010-06-083-3/+12
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-088-10/+32
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-078-10/+32
| | |\
| | | * Accept enter key in the webbrower demo url input.Martin Jones2010-06-071-0/+4
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-047-10/+28
| | | |\
| | | | * Improve input panel handling in declarative demos and examplesJoona Petrell2010-06-037-10/+28
* | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-082-1/+43
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add missing license header.Jason McDonald2010-05-281-0/+41
| * | | | Moved Symbian-specific .pro directive into symbian{} blockGareth Stockwell2010-05-271-1/+2
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-071-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make Fluidlauncher demo have same version as corresponding QtMiikka Heikkinen2010-06-071-0/+1
| | |/ / | |/| |
* | | | 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