summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-05-032-3/+24
|\
| * Fix drawing text in item view:Olivier Goffart2011-05-031-0/+21
| * Fix the tst_QPluginLoader::loadCorruptElf on 64 bitOlivier Goffart2011-05-031-3/+3
* | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-0333-336/+1446
|\ \
| * \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-0333-336/+1446
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-05-0215-204/+312
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-05-0215-204/+312
| | | |\ \
| | | | * \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-291-1/+1
| | | | |\ \
| | | | | * | Fixing potential js hole in the js function for the feedback channel.Morten Engvoldsen2011-04-291-1/+1
| | | | * | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-151-0/+2
| | | | |\ \ \ | | | | | |/ /
| | | | | * | qdoc: Completed task QTBUG-18790Martin Smith2011-04-151-0/+2
| | | | * | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-145-125/+74
| | | | |\ \ \ | | | | | |/ /
| | | | | * | qdoc: Completed task QTBUG-18733Martin Smith2011-04-145-125/+74
| | | | * | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-132-1/+27
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-04-133-2/+10
| | | | | |\ \
| | | | | * | | qdoc: Last commit before merge into master.Martin Smith2011-04-132-1/+27
| | | | * | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-113-2/+10
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-111-21/+7
| | | | | |\ \ \ | | | | | | |/ /
| | | | | * | | Doc: Fixed reference to a name in a table.David Boddie2011-04-111-1/+1
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-073-50/+184
| | | | | |\ \ \
| | | | | * | | | Ensured that incomplete downloads are removed.David Boddie2011-04-072-1/+9
| | | | * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-081-21/+7
| | | | |\ \ \ \ \ | | | | | | |_|/ / | | | | | |/| | |
| | | | | * | | | qdoc: Fixed license comment.Martin Smith2011-04-081-21/+7
| | | | | | |/ / | | | | | |/| |
| | | | * | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-075-75/+210
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | qdoc: Added missing copyright noticeMartin Smith2011-04-071-0/+41
| | | | | * | | qdoc: Updated the QDoc manual.Martin Smith2011-04-071-5/+6
| | | | | * | | qdoc: Updated the QDoc manual.Martin Smith2011-04-071-10/+13
| | | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-04-071-1/+3
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-064-24/+25
| | | | | | |\ \
| | | | | | * | | Aim to fix Windows builds.David Boddie2011-04-051-1/+3
| | | | | * | | | qdoc: Updated the QDoc manual.Martin Smith2011-04-072-39/+128
| | | | | | |/ / | | | | | |/| |
| | | | | * | | qdoc: Updated the QDoc manual.Martin Smith2011-04-063-24/+23
| | | | * | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-061-0/+2
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | qdoc: Fixed QTBUG-18591Martin Smith2011-04-061-0/+2
| | | | | |/ /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-05-0218-133/+1135
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7-review' into 4.7-stagingThierry Bastian2011-05-0218-133/+1135
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-05-021574-20469/+89892
| | | | |\ \ \ \
| | | | | * | | | Fix tst_Q3ProgressBar::setProgress, againGabriel de Dietrich2011-04-291-4/+3
| | | | | * | | | Disable tst_Q3ComboBox::task231724_clear on MacGabriel de Dietrich2011-04-281-0/+4
| | | | | * | | | Fix tst_Q3ProgressBar::setProgress()Gabriel de Dietrich2011-04-281-1/+1
| | | | | * | | | Revert "Fix double painting when adding an item into a linear layout"Jan-Arve Sæther2011-04-282-45/+1
| | | | | * | | | Add missing license headersJan-Arve Sæther2011-04-283-0/+123
| | | | | * | | | Merge branch '4.7-upstream' into 4.7Thierry Bastian2011-04-201556-20336/+88757
| | | | | |\ \ \ \
| | | | | * | | | | Revert "Fixed a crash in QListView"Thierry Bastian2011-04-191-1/+1
| | | | | * | | | | Benchmark for layout hierarchiesJan-Arve Sæther2011-04-143-0/+160
| | | | | * | | | | Manual test for layout flickeringJan-Arve Sæther2011-04-144-0/+298
| | | | | * | | | | Improve invalidate() testcase.Jan-Arve Sæther2011-04-141-59/+276
| | | | | * | | | | Avoid flicker when invalidate is propagated in a widget/layout hierarchyJan-Arve Sæther2011-04-148-76/+321
| | | | | * | | | | Do not call setSizePolicy from ctor, it might call a virtual functionJan-Arve Sæther2011-04-141-2/+2
| | | | | * | | | | Fixed a crash in QListViewThierry Bastian2011-04-111-1/+1