summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-06-221-2/+3
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-211-2/+3
| |\
| | * Fix crash in PropertyChanges.Michael Brasser2011-06-211-2/+3
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-211-0/+6
|\ \ \
| * | | 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-175-35/+45
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-092-4/+13
| |\ \ \ \ | | |/ / /
| | * | | Fix docs on caching for images loaded by image providersBea Lam2011-06-022-4/+13
| | * | | Merge remote-tracking branch 'qt/4.8' into master-qml-teamKai Koehne2011-05-24149-2567/+2603
| | |\ \ \
| * | \ \ \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-081-27/+28
| |\ \ \ \ \
| | * \ \ \ \ Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-06-011-27/+28
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-011-27/+28
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | QDeclarative: Fix QPerformanceTimer on SymbianKai Koehne2011-06-011-27/+28
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-17149-2552/+2552
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Update licenseheader text in source filesJyri Tahtela2011-05-13149-2552/+2552
| * | | | | | Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-06149-2582/+2661
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | 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
| * | | | | | Fixed inconsistent behaviour in Qt.rect().Kim Motoyoshi Kalland2011-05-201-3/+0
* | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-24149-2582/+2658
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-182-0/+4
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-167-30/+102
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-062-0/+4
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | / / | | | | |_|/ / | | | |/| | |
| | | * | | | Uninitialized memory is compared.Martin Jones2011-05-052-0/+4
| | | | |_|/ | | | |/| |
| * | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-162-0/+33
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into master-...Kai Koehne2011-05-122-0/+33
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Allow 'typeinfo <file>' lines in qmldir.Christian Kamm2011-05-122-0/+33
| * | | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-13149-2552/+2552
| |/ / / /
| * | | | Merge remote branch 'qt/4.8' into master-qml-stagingKai Koehne2011-05-108-15/+47
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| * | | Augment documentationAlan Alpert2011-05-091-0/+2
| * | | QmlDebugger: removing slots in Live PreviewChristiaan Janssen2011-05-061-1/+4
| * | | QmlDebugger: adding slots to items in Live PreviewChristiaan Janssen2011-05-062-5/+14
| * | | Removed some trailing whitespaceThorbjørn Lindeijer2011-05-042-22/+22
| * | | Introduced a CONFIG option that enables declarative debug servicesThorbjørn Lindeijer2011-05-042-0/+22
| * | | Moved the QML Observer Service and related functionality into QtThorbjørn Lindeijer2011-05-042-2/+5
* | | | Doc: Fixed qdoc warnings.David Boddie2011-05-111-7/+17
| |/ / |/| |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-043-1/+87
|\ \ \ | |/ /
| * | Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-04-147-33/+71
| |\ \
| * \ \ Merge ../qt-qml-stagingYann Bodson2011-03-293-2/+16
| |\ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtAlan Alpert2011-03-233-2/+65
| |\ \ \ \
| * | | | | Optimization and benchmark for setting object properties from QML.Michael Brasser2011-03-161-0/+27
| * | | | | Merge branch 'master' of ../qt-qml-stagingYann Bodson2011-03-164-11/+24
| |\ \ \ \ \
| * | | | | | Add Constant and Final flags to QMetaObjectBuilderBea Lam2011-03-142-1/+60
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-211-3/+9
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-201-3/+9
| |\ \ \ \ \ \
| | * | | | | | QDeclarativeDebug: Fix endless loop for property with SCRITABLE falseKai Koehne2011-04-201-3/+9
* | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-203-8/+26
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-183-8/+26
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /