summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-2585-107/+779
|\
| * Revert "Reading/writing a non-existent property throws an exception"Aaron Kennedy2010-05-258-28/+34
| * 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-2573-113/+689
| |\
| | * Always pass context to QObject script classAaron Kennedy2010-05-254-6/+9
| | * Reading/writing a non-existent property throws an exceptionAaron Kennedy2010-05-258-34/+28
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-251-2/+2
| | |\
| | | * DocAaron Kennedy2010-05-251-2/+2
| | * | FixWarwick Allison2010-05-251-4/+4
| | * | geolocation (untested)Warwick Allison2010-05-251-0/+8
| | |/
| | * License header.Warwick Allison2010-05-252-0/+82
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-254-13/+13
| | |\
| | | * Fix benchmark warnings on symbian.Michael Brasser2010-05-244-13/+13
| | * | Example of a simple TextEditor look-and-feel.Warwick Allison2010-05-253-6/+90
| | * | Fix TextEdit implicit height.Warwick Allison2010-05-241-1/+1
| | |/
| | * Integrate some QML examples and demos into qtdemoAlan Alpert2010-05-2452-47/+452
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-241556-33869/+44051
| | |\
| | * | Fix typoAlan Alpert2010-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
| * | | | 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
| | * | | | Be slightly more verbose on assigning undefined in binding.Warwick Allison2010-05-243-7/+9
| | |/ / /
| | * | | Do not attempt to setParent of object in a different threadWarwick Allison2010-05-241-3/+5
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-24296-421/+11468
| |\ \ \ \
* | | | | | Remove old symbian specific IAP initialization.Martin Jones2010-05-253-32/+0
| |_|/ / / |/| | | |
* | | | | Don't polish QDeclarativeItems.Warwick Allison2010-05-242-6/+16
| |/ / / |/| | |
* | | | Check QML files for license headers too.Warwick Allison2010-05-241-3/+11
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-2416-93/+62
|\ \ \ \
| * | | | Make compile: include script module for testBea Lam2010-05-241-1/+1
| * | | | 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
| * | | | Factor out initialization effects from declarative benchmarks.Michael Brasser2010-05-244-0/+19
* | | | | Fix TextEdit alignment.Warwick Allison2010-05-242-19/+30
|/ / / /
* | | | Remove license headers from test data.Warwick Allison2010-05-23958-39276/+0
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-232472-33422/+82636
|\ \ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-211233-59/+50334
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-211233-59/+50334
| | |\ \ \
| | | * | | Fix FolderListModel parentFolder property's file drive handlingJoona Petrell2010-05-214-10/+12