summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into file-engine-refactorJoão Abecasis2010-12-021-2/+3
|\
| * Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-2/+3
| |\
| | * Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-121-2/+3
* | | Merge remote branch 'qt/master' into file-engine-refactorJoão Abecasis2010-11-23106-385/+4974
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-122-10/+12
| |\ \ | | |/
| | * 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
| * | | compile fix for namespaced Qthjk2010-11-082-1/+5
| * | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-047-295/+353
| |\ \ \ | | |/ /
| | * | Fix bearermonitor when building for Maemo in scratchbox.Aaron McCarthy2010-11-047-295/+353
| | |/
| * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-271-1/+4
| |\ \ | | |/
| | * Fix empty mifconv TARGETFILE in some edge cases.Miikka Heikkinen2010-10-261-1/+4
| * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-2557-2/+3734
| |\ \ | | |/
| | * 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
| | | | |_|_|_|_|/ | | | |/| | | | |
| * | | | | | | | Fixed spelling.Rohan McGovern2010-10-251-1/+1
| * | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-253-0/+14
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | 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
| * | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-2523-60/+728
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | 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
| | | * | Added the QtWebKit bridge Image Analyzer example.Jerome Pasion2010-10-0414-0/+551
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-04134-142/+157
| | | |\ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-309-57/+79
| | | |\ \ \
| | | * | | | Doc: Fixed a memory leak in the undo example.David Boddie2010-09-221-1/+1
| * | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-152-1/+109
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-10-141-0/+108
| | |\ \ \ \ \
| | | * | | | | Add new behavior example.Yann Bodson2010-10-131-0/+108
| | | | |_|/ / | | | |/| | |
| | * | | | | Fix samegame tutorial jsAlan Alpert2010-10-141-1/+1
| | |/ / / /
| * | | | | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-0813-17/+17