summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-05-312-120/+795
|\
| * Add some convenience functions for QStringRefAnders Bakken2010-05-312-120/+795
* | 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
* | 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-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
* | 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-266-58/+104
* | Added QThreadPool::waitForDone(int msecs)Thomas Sondergaard2010-05-263-4/+33
* | Add support of high unicodes in QUrl.Ritt Konstantin2010-05-261-120/+167
* | QComboBox::modelColumn was not respected when selecting an itemGabriel de Dietrich2010-05-262-4/+11
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-05-253-15/+30
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-05-213-15/+30
| |\ \ | | |/ | |/|
| | * 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-211-1/+1
| | |\
| | | * QComboBox: Fix documentation and make auto-test pass.Gabriel de Dietrich2010-05-211-1/+1
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-2543-419/+694
|\ \ \ \ | |/ / / |/| | |
| * | | 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
| * | | | Added autotest for Component.createObject() without Qt.createComponent()Alan Alpert2010-05-242-5/+9
| * | | | 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-242-1/+18
| |\ \ \ \
| | * | | | Don't crash when assigning a Behavior to a grouped property.Michael Brasser2010-05-242-1/+18
| * | | | | Be slightly more verbose on assigning undefined in binding.Warwick Allison2010-05-241-1/+3
| |/ / / /
| * | | | Do not attempt to setParent of object in a different threadWarwick Allison2010-05-241-3/+5
| * | | | Don't polish QDeclarativeItems.Warwick Allison2010-05-242-6/+16
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-2411-92/+42
| |\ \ \ \
| | * | | | Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivateBea Lam2010-05-2410-94/+34
| | * | | | Allow resource files to be loaded in WorkerScriptBea Lam2010-05-241-3/+11
| | * | | | Component::createObject() don't attempt to set parent of null objectMartin Jones2010-05-241-4/+6
| * | | | | Fix TextEdit alignment.Warwick Allison2010-05-242-19/+30
| |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-2321-237/+164
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-213-57/+106
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-213-57/+106
| | | |\ \ \ \
| | | | * | | | Fix FolderListModel parentFolder property's file drive handlingJoona Petrell2010-05-211-8/+6
| | * | | | | | Fix warningsOlivier Goffart2010-05-212-3/+4
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-2114-184/+118
| | |\ \ \ \ \ \
| | | * | | | | | Fixes QGraphicsItem::scroll issuesBjørn Erik Nilsen2010-05-211-140/+68
| | | * | | | | | Fixes wrong QGraphicsItemCache::boundingRect.Bjørn Erik Nilsen2010-05-211-10/+10