summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Unify naming of import plugin targetsJoona Petrell2010-05-269-12/+12
* Add a way to control when software input panels are shown in TextInput and Te...Joona Petrell2010-05-266-21/+273
* Replace QTime with QElapsedTimerAaron Kennedy2010-05-261-2/+2
* Fix Gradient doc snippet.Yann Bodson2010-05-261-5/+1
* Mention TextInput/Edit::selectByMouse property in QmlChanges.Martin Jones2010-05-253-2/+3
* Add inherits Item to TextEdit and TextInput docs.Martin Jones2010-05-252-2/+4
* 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
| |\ \ \ \
| | * | | | Fixes QGraphicsItem::scroll issuesBjørn Erik Nilsen2010-05-211-140/+68
| | * | | | Fixes wrong QGraphicsItemCache::boundingRect.Bjørn Erik Nilsen2010-05-211-10/+10
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-2114-47/+50
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Revert "Deselect the current selection when the QItemSelectionModel::model is...Olivier Goffart2010-05-213-24/+5
| | | * | | add missing includeOswald Buddenhagen2010-05-201-0/+2
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-2016-52/+72
| | | |\ \ \
| | * | \ \ \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-211-2/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-05-211-2/+0
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-201-2/+0
| | | | |\ \ \ \
| | | | | * | | | Switch Symbian^3 QCursor implementation back to 5.0 wayShane Kearns2010-05-201-2/+0
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-20118-2855/+4135
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Fix crash when using fonts in non-gui QApplicationEskil Abrahamsen Blomfeldt2010-05-201-2/+5
| | * | | | | | | Deselect the current selection when the QItemSelectionModel::model is reset.Stephen Kelly2010-05-203-5/+24
| | * | | | | | | Compile with gcc 4.0.1Olivier Goffart2010-05-209-13/+13
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-203-32/+30
| | |\ \ \ \ \ \ \