summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-251-0/+2
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-241-0/+2
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-241-0/+2
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-241-0/+2
| | | |\
| | | | * Compile with QT_NO_ACTION.Tasuku Suzuki2010-05-231-0/+2
* | | | | 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
* | | | | 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
|/ / / /
* | | | 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
|/ / /
* | | Don't polish QDeclarativeItems.Warwick Allison2010-05-241-1/+7
|/ /
* | 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
|/ /
* | Ensure QML Global Qt object functions appear in the documentation indexWarwick Allison2010-05-212-3/+305
* | docWarwick Allison2010-05-211-2/+2
* | Also show file/line numbers on XML query errors.Warwick Allison2010-05-212-1/+20
* | Print warnings for xml query syntax errorsBea Lam2010-05-211-7/+10
* | Clean upBea Lam2010-05-211-47/+37
* | Add XmlListModel::get()Bea Lam2010-05-212-1/+40
|/
* Update docs with correct property nameAlan Alpert2010-05-201-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-2018-65/+110
|\
| * Work around rendering bug in Rectangle.Michael Brasser2010-05-201-1/+3
| * Remove warnings.Warwick Allison2010-05-202-3/+0
| * Add XmlListModel::errorString()Bea Lam2010-05-202-2/+28
| * Be consistent in conversion from string (eg. color, int rounding).Warwick Allison2010-05-201-11/+14
| * Simplify code to make next change clearer.Warwick Allison2010-05-201-14/+9
| * Stop warnings.Warwick Allison2010-05-202-11/+11
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-202-8/+24
| |\
| | * Stop highlight animators for highlightFollowsCurrentItem: falseMartin Jones2010-05-202-8/+24
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-205-18/+21
| |\ \ | | |/
| | * Rename Component::errorsString() -> errorString() (and also forBea Lam2010-05-203-7/+10
| | * Fixes for docs, example codeBea Lam2010-05-202-11/+11
| * | Ensure valuetype enums can be assigned from JSAaron Kennedy2010-05-201-0/+2
| |/
| * Add return value for resolveTypeInNamespaceAaron Kennedy2010-05-202-3/+3
| * Missing breakAaron Kennedy2010-05-201-0/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-1916-310/+502
|\ \ | |/
| * Search for QML import libraries also in application directoryKai Koehne2010-05-192-8/+16
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-1910-171/+334
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-192-157/+234
| | |\