summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-304-8/+11
|\
| * Undefined is undefined, and now qml warns about itmae2010-06-291-3/+3
| * Avoid binding loop.Yann Bodson2010-06-291-1/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-292-4/+6
| |\
| | * Tweak Qt Demo BehaviourAlan Alpert2010-06-251-0/+1
| | * Stop other mouse buttons propagatingAlan Alpert2010-06-241-0/+1
| | * Expand on warning messageAlan Alpert2010-06-241-1/+1
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-247-34/+20
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-227-7/+7
| | |\ \
| | * | | Check for main.qml firstAlan Alpert2010-06-221-3/+3
* | | | | Fixed deployment paths for the symbian/linux-armcc mkspec.axis2010-06-291-4/+5
* | | | | Fixed a relative path problem in qml demos.axis2010-06-297-7/+7
|/ / / /
* | | | Merge branch '4.6-s60' into 4.7-s60axis2010-06-243-3/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Updated UIDs for spectrum demoGareth Stockwell2010-06-233-3/+3
* | | | There where still references to the old Assistant.kh12010-06-231-1/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-222-3/+0
|\ \ \ \
| * | | | Removed unnecessary data_caging_paths.prf loading from applicationsMiikka Heikkinen2010-06-222-3/+0
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-222-4/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-222-4/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Remove the old WebView element in src/import. The new one is in src/3rdparty/...Alexis Menard2010-06-182-4/+3
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-212-26/+16
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-211-0/+4
| |\ \ \ \
| | * | | | Fix example compile and runtime warnings, webkit examples not built.Friedemann Kleint2010-06-181-0/+4
| | |/ / /
| * | | | 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-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-217-7/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Assigning 0xA UID3s to the new standalone qml demosAlessandro Portale2010-06-177-7/+7
| |/ /
* | | Avoid printing a warningAlan Alpert2010-06-211-1/+2
* | | Only steal hover events when enabled, in QtDemo's qml integrationAlan Alpert2010-06-211-1/+1
* | | Allow things that load SameGame to disable the Quit buttonAlan Alpert2010-06-212-0/+3
* | | Seems to fix the keyboard focus confusionAlan Alpert2010-06-211-2/+5
|/ /
* | 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
|/ / /