summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-08-191-7/+7
|\
| * Doc: Fixes to Qt tutorialGeir Vattekar2011-07-291-7/+7
* | Merge remote-tracking branch 'review/master'Sergio Ahumada2011-08-186-6/+6
|\ \
| * | Fix files that don't end with a newline characterSergio Ahumada2011-08-126-6/+6
| |/
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-151-2/+2
|\ \ | |/ |/|
| * Fix fancybrowser.proShane Kearns2011-08-041-1/+1
| * Re-apply licenseheader text in source files for qt4.7Jyri Tahtela2011-07-0114-241/+241
* | Removed demo files accidentally introduced by commit 3abaecc3.David Boddie2011-07-19176-9889/+0
* | Removed files with 3rd party copyright notices.Jerome Pasion2011-07-118-3549/+81
* | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtJerome Pasion2011-07-081-0/+1
|\ \
| * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-06-291-0/+1
| |\ \
| | * \ Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8Alexis Menard2011-06-221920-1548/+68125
| | |\ \
| | * | | Fix build of Fancy Browser demo.Alexis Menard2011-06-021-0/+1
* | | | | Applied fix (dea9ca8b7a4166e1c3d3fc374621ad02c1220d3a)from qt5/qtbase.David Boddie2011-07-043-1/+6
|/ / / /
* | | | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-2766-1133/+1133
* | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-2435-0/+1448
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-06-201-1/+11
| |\ \
| * | | Qmlshadersplugin examples added.Marko Niemelä2011-06-1335-0/+1448
* | | | Doc: Fixed spelling errors that were blocking the CI system.David Boddie2011-06-201-2/+2
* | | | Added missing license headers.David Boddie2011-06-173-0/+120
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-176-10/+26
|\ \ \ \
| * \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-073-0/+14
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-063-0/+14
| | |\ \ \ | | | |/ /
| | | * | Have -small-screen enabled in certain examples on Symbian always.Laszlo Agocs2011-06-063-0/+14
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-311-1/+11
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-271-1/+11
| | |\ \ | | | |/ | | |/|
| | | * Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA...Joona Petrell2011-05-271-1/+11
| * | | Merge remote-tracking branch 'qt/4.8' into master-qml-teamKai Koehne2011-05-2416-2149/+24
| |\ \ \
| * | | | Fix QtDeclarative keyinteraction exampleYann Bodson2011-05-232-2/+2
* | | | | Added missing license headers.David Boddie2011-06-153-0/+120
* | | | | Doc: Added missing license headers for documentation and examples.David Boddie2011-06-08174-0/+6960
* | | | | Doc: Speculative attempt to fix build breakage.David Boddie2011-06-081-1/+1
* | | | | Doc: Fixed file name of a header file to use lower case characters.David Boddie2011-06-071-1/+1
* | | | | Merge branch '4.8'David Boddie2011-05-272-2/+2
|\ \ \ \ \
| * | | | | Doc: Fixed a scope test for maemo5 and made an error a warning instead.David Boddie2011-05-272-2/+2
| * | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-2414-2149/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
* | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-2414-2149/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Revert all QScroller and QFlickGesture related code.Robert Griebl2011-05-1614-2149/+0
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-031-0/+6
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-05-021-0/+6
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Ensured that incomplete downloads are removed.David Boddie2011-04-071-0/+6
* | | | | | Merge branch '4.8'David Boddie2011-05-133-2/+6
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Doc: Added missing project and desktop files.David Boddie2011-05-1115-0/+235
| * | | | | Doc: Added fixes left over from previous merges.David Boddie2011-05-111-0/+3
| * | | | | Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-111318-0/+57782
| * | | | | Doc: Fixed incorrect button handling.David Boddie2011-05-091-2/+2
| * | | | | More examples adjusted to Symbian and Maemo5.Daniel Molkentin2011-05-052-0/+16
| * | | | | Added missing resource files.David Boddie2011-05-042-0/+12
| * | | | | Added missing data files. Renamed resource files.David Boddie2011-05-046-0/+159
| * | | | | Fixed line endings.David Boddie2011-05-047-0/+316