summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-09-162-5/+8
|\
| * Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-09-1483-596/+2818
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-122-5/+8
| |\ \
| | * | StrictlyEnforceRange with snapOneItem/Row and header behavior changeMartin Jones2011-09-122-5/+8
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-09-153-4/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix crash in compiled bindingsAaron Kennedy2011-09-143-4/+12
* | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-09-074-2/+18
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-074-2/+18
| |\ \ \ | | | |/ | | |/|
| | * | Dragging in nested views no longer works as expectedMartin Jones2011-09-071-1/+1
| | * | Fix implicit height not growing when pre-edit text wraps.Andrew den Exter2011-09-061-1/+3
| | * | Fix leak in State element.Michael Brasser2011-09-021-0/+12
| | * | Fix leak in bindings created by PropertyChanges.Michael Brasser2011-09-011-0/+2
* | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-09-022-4/+8
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-022-4/+8
| |\ \ \ | | |/ /
| | * | Revert readonly BorderImage::sourceSize changeMartin Jones2011-09-012-4/+8
| | * | Fix memory leak in ListModel custom parserBea Lam2011-09-011-0/+1
* | | | Merge branch 4.8 into qt-4.8-from-4.7Sergio Ahumada2011-09-011-0/+5
|\ \ \ \
| * \ \ \ Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-311-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch '4.8'Casper van Donderen2011-08-301-0/+5
| |\ \ \ \ \
| | * | | | | Doc: Internalized QDeclarativeTypeLoaderGeir Vattekar2011-08-241-0/+5
| | * | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-06-1720-97/+193
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-06-0925-212/+110
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7Sergio Ahumada2011-08-314-4/+7
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-301-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | QDeclarative::hasActiveFocus should return false for hidden itemsAlan Alpert2011-08-301-2/+2
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-291-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fix conversion of QAbstractItemModel::rowsMoved() parametersBea Lam2011-08-291-1/+1
| * | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-2715-35/+49
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-262-1/+3
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Fix memory leak in ListModel custom parserBea Lam2011-08-251-0/+1
| | * | | | | | | Correct documentation of TextInput.PasswordEchoOnEdit.Andrew den Exter2011-08-221-1/+2
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-181-0/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Improve documentation for QDeclarativeView::setSource()Keith Isdale2011-08-181-0/+2
* | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-3115-33/+33
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Revert accidental commitBea Lam2011-08-301-205/+91
| * | | | | | | | Rework threading internals in XmlListModel to avoid global staticBea Lam2011-08-301-91/+205
| * | | | | | | | Fix undesirable VKB popup at task switchMiikka Heikkinen2011-08-302-2/+2
| * | | | | | | | Doc: Standardized on QtQuick for \since declarations.David Boddie2011-08-3013-31/+31
* | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-271-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Porting the QTBUG-21084 fix to 4.7.4mread2011-08-261-0/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-2615-35/+49
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-2415-33/+33
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-232-2/+16
| |\ \ \ \ \ \
| | * | | | | | Fix left alignment of native RTL pre-edit text.Andrew den Exter2011-08-232-2/+16
| | * | | | | | Revert accidental commitBea Lam2011-08-111-205/+91
| | * | | | | | Rework threading internals in XmlListModel to avoid global staticBea Lam2011-08-111-91/+205
| | |/ / / / /
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-08-1813-31/+31
| |\ \ \ \ \ \
| | * | | | | | Doc: Standardized on QtQuick for \since declarations.David Boddie2011-06-3013-31/+31
* | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-152-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-082-2/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |