summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191441-1452/+1454
|\
| * Update copyright year to 2011.Jason McDonald2011-01-101440-1448/+1448
| * Examples: Fix compilation with namespace.Christian Kandeler2011-01-072-4/+4
| * fix include pathMark Brand2011-01-061-0/+2
* | Fix examples autotest failureJoona Petrell2011-01-111-1/+1
* | PinchArea API changes following review.Martin Jones2011-01-071-3/+3
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-072-4/+4
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-12-212-4/+4
| |\
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-032-2/+9
| | |\
| | * | Doc:Fix paths in styleplugin/echoplugin .pro filesGeir Vattekar2010-11-262-4/+4
* | | | Use deselect() function in text selection exampleJoona Petrell2010-12-311-1/+1
* | | | Add copyright headerMartin Jones2010-12-201-0/+40
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Joona Petrell2010-12-201-1/+1
|\ \ \ \ | |/ / /
| * | | Fix invalid configurations being added to bearermonitor list.Aaron McCarthy2010-12-151-1/+1
| | |/ | |/|
* | | Revert "Add mirroring-positioners.qml example" that was accidentally pushedJoona Petrell2010-12-131-70/+0
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2010-12-133-2/+79
|\ \ \
| * | | Add mirroring-positioners.qml exampleJoona Petrell2010-12-131-0/+70
| |/ /
| * | Add 'Writing New Components' docs, and document the connect() function.Bea Lam2010-12-032-2/+9
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2010-12-011-2/+3
|\ \ | |/
| * Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-121-2/+3
* | Add an example of using PinchArea.Martin Jones2010-11-292-0/+50
|/
* docWarwick Allison2010-11-091-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-051-9/+11
|\
| * highlightranges.qml example and visual test contained binding loop.Martin Jones2010-11-031-9/+11
* | Fix bearermonitor when building for Maemo in scratchbox.Aaron McCarthy2010-11-047-295/+353
|/
* Fix empty mifconv TARGETFILE in some edge cases.Miikka Heikkinen2010-10-261-1/+4
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-2557-2/+3734
|\
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-221-41/+0
| |\
| * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-201-16/+18
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-201-1/+1
| |\ \ \
| * | | | Fixed case of a library file name to enable MinGW builds on Fedora.David Boddie2010-10-201-2/+2
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-152-1/+109
| |\ \ \ \
| | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-142-1/+109
| | |\ \ \ \
| * | \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-085-47/+198
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Resized image, added missing files, and reformatted documentation ofJerome Pasion2010-10-085-47/+198
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-071-1/+2
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Doc: Renamed a project file.David Boddie2010-10-061-0/+0
| * | | | | | Doc: Added missing examples and snippets.David Boddie2010-10-0656-0/+3732
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-253-0/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add header guards to audio example headers.Justin McPherson2010-10-083-0/+14
* | | | | | | Remove accidentially committed .qmlproject.user file, ignore this filetypeDaniel Molkentin2010-10-221-41/+0
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-191-16/+18
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Tic-tac-toe: Fix z-order of status text.Daniel Molkentin2010-10-191-16/+18
* | | | | | Only add ICON for application projects in symbianpkgrules.priMiikka Heikkinen2010-10-191-1/+1
|/ / / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1420-2/+709
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Added missing QtWebKit example files and some whitespace fixes.Jerome Pasion2010-10-095-47/+198
| | |_|/ | |/| |
| * | | Doc: Fixing bug - line too long and not visible. Breaking the line in twoMorten Engvoldsen2010-10-071-1/+2
| | |/ | |/|
| * | Added a project file for the Getting Started with QML and changed theJerome Pasion2010-10-062-0/+4