summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-176-19/+98
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-151-0/+9
| |\
| | * Use QML notation for documenting TextInput::accepted() signal.Andrew den Exter2011-02-151-4/+4
| | * Document the TextInput accepted() signal.Andrew den Exter2011-02-151-0/+9
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-145-19/+89
| |\ \ | | |/
| | * Rename 'plugins\qmldebugging' (work around qmake issues)Kai Koehne2011-02-111-1/+1
| | * Correct the "module not installed" error handlingAaron Kennedy2011-02-111-12/+13
| | * Flickable uses the flick velocity to determine whether to retain grabMartin Jones2011-02-111-1/+6
| | * Make addImportPath() work for windows paths starting with lower caseBea Lam2011-02-111-2/+4
| | * Report any exceptions occurring in WorkerScript javascript codeBea Lam2011-02-111-3/+63
| | * MouseArea docs - link to onCanceled() from onReleased()Bea Lam2011-02-111-0/+2
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-105-16/+48
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-105-16/+48
| |\ \ | | |/
| | * PathView items were not correctly updated when rootIndex changed.Martin Jones2011-02-101-16/+28
| | * Allow text to selected in a TextEdit or TextInput inside a Flickable.Andrew den Exter2011-02-104-0/+20
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-1035-326/+603
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-103-5/+62
| |\ \ | | |/
| | * Update modules-related tests and docsBea Lam2011-02-102-2/+24
| | * CLeanup registers after AddStringAaron Kennedy2011-02-101-3/+38
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-095-57/+44
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2011-02-097-24/+95
| | |\
| | | * PathView regression: dragging the path didn't update currentIndexMartin Jones2011-02-091-1/+1
| | | * Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from m...Yann Bodson2011-02-092-6/+8
| | * | Call onAdd() for first items added to ListView and GridViewBea Lam2011-02-092-50/+35
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-081-12/+64
| |\ \ \ | | | |/ | | |/|
| | * | Support seperate versions of installed modulesmae2011-02-081-12/+64
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-081-1/+11
| |\ \ \ | | |/ /
| | * | Scroll TextInput to ensure preedit text is visible.Andrew den Exter2011-02-081-1/+11
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-0710-15/+146
| |\ \ \ | | |/ /
| | * | Changing header/footer size during creation caused recusionMartin Jones2011-02-072-4/+8
| | * | Ensure section delegates are updated when the section property changes.Martin Jones2011-02-071-0/+3
| | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2011-02-047-5/+34
| | |\
| | | * modelChanged() should not be emitted until view is repopulatedBea Lam2011-02-041-1/+1
| | | * AnimatedImage does not notify on status change.Yann Bodson2011-02-042-3/+20
| | | * Clarify case preservation in QDeclarativeImageProvidersAlan Alpert2011-02-042-1/+11
| | * | Allow unknown types to be passed opaquely through signalsAaron Kennedy2011-02-033-6/+103
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-02-0424-237/+277
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-2616-69/+108
| | |\ \
| | * | | Doc: Fixed qdoc warnings about broken links.David Boddie2011-01-262-2/+2
| | * | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-262-11/+16
| | * | | Doc: Fixed broken QML code snippets.David Boddie2011-01-251-0/+2
| | * | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-247-58/+101
| | * | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-21297-504/+498
| | |\ \ \
| | | * | | Doc: Fixed QML syntax.David Boddie2011-01-192-15/+23
| | | * | | Doc: Fixed invalid/incomplete QML code snippets.David Boddie2011-01-179-89/+71
| | | * | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-13297-378/+396
| | | |\ \ \
| | | * | | | Doc: Fixed QML syntax in quoted code snippets.David Boddie2010-12-212-23/+5
| | | * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-204-8/+24
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-161-1/+4
| | | |\ \ \ \ \
| | * | | | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-213-11/+13