summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Added autotest for Component.createObject() without Qt.createComponent()Alan Alpert2010-05-248-8/+60
| * 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
| * 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
| | | | * Add license headers for .qml files.Jason McDonald2010-05-211227-0/+50179
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-211235-33396/+32305
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix warningsOlivier Goffart2010-05-212-3/+4
| | | * | Fix shadow building of spectrum demoRhys Weatherley2010-05-211-1/+1
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-2140-249/+465
| | | |\ \
| | | | * | Fixes QGraphicsItem::scroll issuesBjørn Erik Nilsen2010-05-213-141/+158
| | | | * | 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-2117-76/+181
| | | | |\ \ | | | |/ / / | | |/| | |
| | | | * | changes-4.7.0 updatedJoerg Bornemann2010-05-211-1/+1
| | | | * | Revert "Deselect the current selection when the QItemSelectionModel::model is...Olivier Goffart2010-05-214-67/+9
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-2120-84/+247
| | | | |\ \
| | | | | * | 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-2019-84/+245
| | | | | |\ \
| | * | | | \ \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-217-16/+140
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-05-217-16/+140
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-201-9/+81
| | | | |\ \ \ \ \
| | | | | * | | | | My 4.6.3 changes.Trond Kjernåsen2010-05-201-16/+73
| | | | | * | | | | Added my 4.6.3 changes.Kim Motoyoshi Kalland2010-05-201-1/+4