summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-2513-67/+266
|\
| * Fix compilation of qegl.cpp after the last mergeThiago Macieira2010-05-251-1/+2
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-2513-68/+266
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-244-35/+84
| | |\
| | | * Fix a race condition with QtDBus blocking for replies.Thiago Macieira2010-05-244-34/+83
| | | * QtDBus: Debug message updateThiago Macieira2010-05-241-1/+1
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-212-15/+34
| | |\ \ | | | |/ | | |/|
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-212-15/+34
| | | |\
| | | | * Fixed an assert in QMenuThierry Bastian2010-05-211-11/+1
| | | | * Call eglTerminate() when the last QEglContext is destroyed to free mem.Trond Kjernåsen2010-05-211-4/+33
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-217-17/+206
| | |\ \ \
| | | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-05-217-17/+206
| | | |/ /
| | * | | Backport multitouch bug fixes to 4.6Shane Kearns2010-05-212-7/+19
| | * | | Removed double EINTR loop from nativeWrite and nativeRead.Janne Anttila2010-05-211-8/+2
| | * | | Fixing the race condition in event dispatcher implementation onAleksandar Sasha Babic2010-05-212-10/+56
| | |/ /
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-211-1/+1
| | |\ \
| | | * | Fixing the compile issue.Aleksandar Sasha Babic2010-05-211-1/+1
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-202-2/+71
| | |\ \ \ | | | |/ / | | |/| |
| | | * | QAudioDeviceInfo::nearestFormat() consistent across all platformsKurt Korbatits2010-05-191-1/+61
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-05-197-17/+36
| | | |\ \
| | | * | | The documentation for processedUSecs() is ambiguousKurt Korbatits2010-05-191-1/+10
* | | | | | Revert "Reading/writing a non-existent property throws an exception"Aaron Kennedy2010-05-254-14/+26
* | | | | | Revert "Always pass context to QObject script class"Aaron Kennedy2010-05-254-9/+6
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-259-40/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Always pass context to QObject script classAaron Kennedy2010-05-254-6/+9
| * | | | | Reading/writing a non-existent property throws an exceptionAaron Kennedy2010-05-254-26/+14
| * | | | | DocAaron Kennedy2010-05-251-2/+2
| * | | | | Example of a simple TextEditor look-and-feel.Warwick Allison2010-05-252-6/+19
| * | | | | Fix TextEdit implicit height.Warwick Allison2010-05-241-1/+1
* | | | | | 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
| |\ \ \ \ \ \ \ \