summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-06-019-1/+22
|\
| * Examples: Fix compilation with namespaces.ck2010-06-019-1/+22
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-06-012-19/+17
|\ \ | |/
| * Cocoa: remove 'double' content view from window, second tryRichard Moe Gustavsen2010-06-012-19/+17
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-05-312-1/+2
|\ \ | |/
| * Revert "Cocoa: remove 'double' content view from window"Richard Moe Gustavsen2010-05-311-15/+18
| * Cocoa: fix broken drawers after content view structure changeRichard Moe Gustavsen2010-05-311-0/+2
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-05-312-19/+15
| |\ |/ /
| * Cocoa: remove 'double' content view from windowRichard Moe Gustavsen2010-05-311-18/+15
| * Revert the change in applicationShouldTerminate().Fabien Freling2010-05-311-1/+0
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-05-312-3/+13
|\ \
| * | Changes: add patch for artificial emboldeningMike FABIAN2010-05-312-3/+13
|/ /
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-05-2811-75/+100
|\ \
| * | Avoid sending deprecated Qt3Support events if the application was built witho...Olivier Goffart2010-05-288-37/+84
| * | Make QWeakPointer and QSharedPointer movableOlivier Goffart2010-05-282-3/+11
| * | Speedup destruction of QObject if the eventloop is not entered.Olivier Goffart2010-05-284-35/+5
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-05-284-6/+17
|\ \ \ | | |/ | |/|
| * | fix for tst_qfiledialog2 to distinguish between C: and C:/Zeno Albisser2010-05-281-2/+2
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-05-273-4/+15
| |\ \ |/ / /
| * | make QFileSystemModel::rmdir(dir) remove dir from fileInfoGathererZeno Albisser2010-05-272-3/+9
| * | make QFileSystemWatcher_win distinguish C: from C:\Zeno Albisser2010-05-271-1/+2
| * | make QFileSystemModel distinguish C: from C:\Zeno Albisser2010-05-271-0/+4
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-05-2617-208/+447
|\ \ \ | | |/ | |/|
| * | Improved documentation for QSharedMemory's key/setKey functions.Andreas Aardal Hanssen2010-05-261-27/+37
| * | Added native key support to QSharedMemory API.Mirko Damiani2010-05-267-65/+123
| * | Make test work with shadow builds again.Andreas Aardal Hanssen2010-05-261-4/+4
| * | Added QThreadPool::waitForDone(int msecs)Thomas Sondergaard2010-05-264-4/+60
| * | Add support of high unicodes in QUrl.Ritt Konstantin2010-05-263-133/+222
| * | QComboBox::modelColumn was not respected when selecting an itemGabriel de Dietrich2010-05-263-4/+30
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-05-254-17/+36
|\ \ \ | |/ /
| * | Fix tst_QComboBox::maxVisibleItems() auto-test on MacGabriel de Dietrich2010-05-251-1/+3
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-05-254-17/+34
| |\ \ |/ / /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-05-214-17/+34
| |\ \
| | * | Use binarysort to find items.Gunnar Sletta2010-05-212-14/+29
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-05-212-3/+5
| | |\ \
| | | * | QComboBox: Fix documentation and make auto-test pass.Gabriel de Dietrich2010-05-212-3/+5
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-05-251557-33870/+44053
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-251557-33870/+44053
| |\ \ \ \ |/ / / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-251-1/+2
| |\ \ \ \
| | * | | | Fixed compile with xlC.Rohan McGovern2010-05-251-1/+2
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-248-8/+60
| |\ \ \ \ \
| | * | | | | Added autotest for Component.createObject() without Qt.createComponent()Alan Alpert2010-05-248-8/+60
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2415-30/+80
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Compiler warningAaron Kennedy2010-05-241-1/+1
| | * | | | | Remove incorrect ASSERTAaron Kennedy2010-05-241-3/+1
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-248-10/+48
| | |\ \ \ \ \
| | | * | | | | Doc fixesYann Bodson2010-05-242-5/+5
| | | * | | | | Don't crash when assigning a Behavior to a grouped property.Michael Brasser2010-05-244-1/+38
| | | * | | | | Get rid of 'noise' when using GL and the top-level item is an Item.Michael Brasser2010-05-241-1/+2
| | | * | | | | Fix visual tests after rename of the qml executable.Michael Brasser2010-05-241-3/+3