summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-12126-645/+714
|\
| * Example code style improvementsBea Lam2010-04-097-206/+195
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-091-0/+8
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0910-139/+122
| | |\
| | * | self-docWarwick Allison2010-04-091-0/+8
| * | | Replace "property var " with "property variant " in QML codeAaron Kennedy2010-04-098-14/+14
| | |/ | |/|
| * | Some cleanup in widgets module. Deletion of GraphicsObjectContainer.Alexis Menard2010-04-091-20/+15
| * | Straighten board linesBea Lam2010-04-091-0/+0
| * | More tutorial improvmentsBea Lam2010-04-098-119/+107
| |/
| * Fix call to saveHighScores() and restore game timer.Bea Lam2010-04-083-6/+4
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-04-08121-289/+379
| |\
| | * Fix warning in declarative/examples/velocityLeonardo Sobral Cunha2010-04-081-2/+6
| | * Fix samegame4 tutorial codeLeonardo Sobral Cunha2010-04-082-12/+3
| | * Missing fileYann Bodson2010-04-081-0/+0
| | * Renamed 'source' property from SpringFollow to 'to'Leonardo Sobral Cunha2010-04-088-16/+15
| | * Add running of examples to quality gate.Warwick Allison2010-04-082-2/+2
| | * Improve velocity exampleYann Bodson2010-04-084-135/+84
| | * Missing fileAaron Kennedy2010-04-082-1/+146
| | * Replace "import Qt 4.6" with "import Qt 4.7"Michael Brasser2010-04-08115-116/+116
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-081-0/+1
| | |\
| | * | Replace Text::wrap property with Text::wrapMode enumeration.Martin Jones2010-04-085-8/+10
| * | | Improve example code - rename variables, remove redundant ids.Bea Lam2010-04-0813-156/+156
| | |/ | |/|
| * | needs focusWarwick Allison2010-04-081-0/+1
| |/
* | Fixing the missing "\\"Aleksandar Sasha Babic2010-04-081-1/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-061-1/+1
|\
| * Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errorsJohan Hauan2010-04-061-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-061-0/+27
|\ \ | |/ |/|
| * Labs (experimental) Gesture support.Warwick Allison2010-04-061-0/+27
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-021-0/+3
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-011-0/+3
| |\ \
| | * \ Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-0126-74/+81
| | |\ \ | | | |/
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-011-0/+3
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-311-0/+3
| | | |\ \
| | | | * \ Merge commit 'origin/4.7' into symbian47Thomas Zander2010-03-317-328/+2
| | | | |\ \
| | | | * | | Work around bad naming of exported class in symbian sdk causing conflictThomas Zander2010-03-301-0/+3
* | | | | | | Fix some more Q_PROPERTY followed by semi-colonThiago Macieira2010-04-025-8/+8
|/ / / / / /
* | | | | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-0129-93/+96
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-0126-74/+81
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Make QML 'hello world' tutorial less confusing.Yann Bodson2010-04-013-20/+19
| | * | | | Doc improvements, fixesBea Lam2010-04-0113-31/+31
| | * | | | Fix imageprovider example compilation on Symbian armJoona Petrell2010-04-011-0/+4
| | * | | | Fix plugin example compilation on Symbian armJoona Petrell2010-04-012-12/+13
| | * | | | Renamed widgets example to proxywidgets to avoid conflictsJoona Petrell2010-04-017-11/+14
| | |/ / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-313-19/+15
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-303-19/+15
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-03-30425-1243/+16761
| | | |\ \
| | | | * \ Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-301-1/+2
| | | | |\ \ | | | | | |/
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-303-19/+15
| | | | |\ \
| | | | | * \ Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-257-10/+36
| | | | | |\ \
| | | | | * | | Fix warnings and build on mingwThierry Bastian2010-03-253-19/+15