summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-11-290-0/+0
|\
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-11-281466-35763/+13370
| |\
* | \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-11-280-0/+0
|\ \ \
| * \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-11-271475-35811/+13533
| |\ \ \
| | * \ \ Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-11-261475-35811/+13533
| | |\ \ \ | | | | |/ | | | |/|
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-11-261669-67604/+83753
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-11-12717-54850/+43172
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-10-031116-16495/+49318
| | |\ \ \ \
* | | \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-282-0/+12
|\ \ \ \ \ \ \
| * | | | | | | SSL: fix build when compiled with -openssl-linkedPeter Hartmann2011-11-282-0/+12
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-286-4/+16
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-256-4/+16
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'flex/master'Pasi Pentikainen2011-11-255-1/+16
| | |\ \ \ \ \ \
| | | * | | | | | New API to set AVKON flag to inputcontext in Qt/Symbian.Satyam Bandarapu2011-11-255-1/+16
| | * | | | | | | Merge remote-tracking branch 'flex/master'Pasi Pentikainen2011-11-251-3/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Fixing memory leak in QtGui qt_cleanupJani Hyvonen2011-11-221-3/+0
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-11-2614-17/+17
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'qt-qa-review/master'Sergio Ahumada2011-11-2614-17/+17
| |\ \ \ \ \ \ \ \ \ |/ / / / / / / / / / | | | | | _ / / / / | | | | | / / / /
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-2214-17/+17
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Doc: Fixing typoSergio Ahumada2011-08-1714-17/+17
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-254-27/+27
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-243-26/+26
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Symbian-linux crosscompilation case changesPasi Pentikainen2011-11-243-26/+26
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-241-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Symbian-linux crosscompilation debug-release alignPasi Pentikainen2011-11-241-1/+1
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-25248-5152/+266
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added missing license header.Rohan McGovern2011-11-251-0/+40
| * | | | | | | | | Adjust pathes once again.Daniel Molkentin2011-11-241-3/+3
| * | | | | | | | | Fixed a linkKevin Wright2011-11-241-1/+1
| * | | | | | | | | Fixed a linkKevin Wright2011-11-241-1/+1
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingKevin Wright2011-11-249-0/+10
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Rename files to show up in docs.Casper van Donderen2011-11-249-0/+10
| * | | | | | | | | | Split behavior and wigglytext examplesKevin Wright2011-11-248-0/+214
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingKevin Wright2011-11-24175-2955/+49
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix up examples.Daniel Molkentin2011-11-24175-2955/+49
| * | | | | | | | | | Whitespace changes and added depends.Kevin Wright2011-11-241-5/+5
| |/ / / / / / / / /
| * | | | | | | | | Fixed some linking issues.Kevin Wright2011-11-242-2/+5
| * | | | | | | | | Removed unecessary files from folders.Kevin Wright2011-11-2416-532/+0
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingCasper van Donderen2011-11-2429-1701/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Changed some of the short descriptions for WebView examples.Kevin Wright2011-11-241-3/+3
| | * | | | | | | | | Removed unecessary duplicate files.Kevin Wright2011-11-2429-1698/+2
| * | | | | | | | | | Fixes for the manifest and links.Casper van Donderen2011-11-242-9/+7
| |/ / / / / / / / /
| * | | | | | | | | Fix link to WebView examples.Casper van Donderen2011-11-241-9/+10
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingCasper van Donderen2011-11-241-13/+16
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed lists to be ordered lists and added curly bracketsKevin Wright2011-11-241-13/+16
| * | | | | | | | | | Fix link to ListView and WebView example pages.Casper van Donderen2011-11-241-2/+2
| * | | | | | | | | | Change the links to behavior examples.Casper van Donderen2011-11-242-2/+2
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-stagingKevin Wright2011-11-243-11/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix warning about unbalanced parantheses.Daniel Molkentin2011-11-241-4/+4
| | * | | | | | | | | Fix abstractitemmodel compilation error.Daniel Molkentin2011-11-242-7/+0