summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-012-7/+10
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-06-292-7/+10
| |\
| | * Fix text color in some cases of QML and QStaticTextEskil Abrahamsen Blomfeldt2011-06-292-7/+10
* | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-222-4/+5
|\ \ \
| * \ \ Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-06-222-4/+5
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-212-4/+5
| | |\ \
| | | * | Fix crash in PropertyChanges.Michael Brasser2011-06-211-2/+3
| | | * | Scroll correctly when cursorPosition is changed within onTextChanged.Andrew den Exter2011-06-201-2/+2
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-222-2/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix QDeclarativeInspector when starting with ,blockAurindam Jana2011-06-212-2/+14
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-213-6/+30
|\ \ \ \ \ | |/ / / /
| * | | | QDeclarativeDebug: Fix cases where multiple packets arrive in one goKai Koehne2011-06-201-6/+13
| * | | | Rewrite autotests for js debuggingAurindam Jana2011-06-141-0/+11
| * | | | Create property cache in case of Component{} rootAaron Kennedy2011-06-101-0/+6
* | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-1742-309/+303
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-0920-97/+193
| |\ \ \ \ \ | | |/ / / /
| | * | | | QDeclarativeDebug: Don't hang if started with ',block' argumentKai Koehne2011-06-091-0/+1
| | * | | | QDeclarativeDebug: Fix QJSDebugService if launched with ',block'Kai Koehne2011-06-083-1/+24
| | * | | | Fix docs on caching for images loaded by image providersBea Lam2011-06-023-4/+39
| | * | | | QDeclarative: fixed clean animation listsChristiaan Janssen2011-05-313-7/+39
| | * | | | Renamed declarativeobserver plugin to qmldbg_inspectorThorbjørn Lindeijer2011-05-305-39/+39
| | * | | | QmlDebugger: adding slots to items in Live PreviewChristiaan Janssen2011-05-302-3/+5
| | * | | | QmlDebugger: parsing packets iteratively in the communication protocolChristiaan Janssen2011-05-301-38/+35
| | * | | | ListView segmentation fault when setting highlight to nullMartin Jones2011-05-303-3/+9
| | * | | | Merge remote-tracking branch 'qt/4.8' into master-qml-teamKai Koehne2011-05-24324-5645/+5981
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-0822-208/+106
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' into qt-4.8-from-4.7Liang Qi2011-06-065-36/+16
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-045-36/+16
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | Revert some of "Make QMLViewer startup animation stop after a while"Alan Alpert2011-06-033-36/+0
| | | | * | | | Add private method for flushing the pixmap cache.Michael Brasser2011-06-022-0/+16
| | * | | | | | Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-06-012-28/+29
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-012-28/+29
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | QDeclarative: Fix QPerformanceTimer on SymbianKai Koehne2011-06-012-28/+29
| | * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-3114-108/+38
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-2714-108/+38
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA...Joona Petrell2011-05-2714-108/+38
| | * | | | | | Merge branch '4.8' into qt-4.8-from-4.7Liang Qi2011-05-272-1/+4
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-251-1/+1
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-251-1/+1
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | / | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | Flickable could flick in wrong direction if given too few touch samplesMartin Jones2011-05-251-1/+1
| | * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-242-36/+23
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | / | | | |_|_|_|/ | | |/| | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-202-36/+23
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Notify when the TextInput cursorRectangle property changes within pre-editAndrew den Exter2011-05-202-36/+23
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-17317-5411/+5411
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Update licenseheader text in source filesJyri Tahtela2011-05-13317-5411/+5411
| * | | | | | Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-06325-5465/+7081
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-242-1/+4
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge remote branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2011-05-232-1/+4
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | DocAaron Kennedy2011-05-161-0/+3
| | | | * | | QmlDirParser: Fix typeInfo accessor.Kai Koehne2011-05-121-1/+1