summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-04-147-33/+71
|\
| * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-121-1/+27
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-121-1/+27
| | |\
| | | * Allow enum values to be used as signal parametersBea Lam2011-04-121-1/+27
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-072-3/+3
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-04-061-2/+2
| | |\ \
| | | * | Doc: Fixed markup.David Boddie2011-03-251-2/+2
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-225-12/+88
| | | |\ \ | | | | |/
| | * | | Removing extra comma in `enum' declaration.Sergio Ahumada2011-04-051-1/+1
| * | | | Put all the declarations of qt_defaultDpi{,X,Y}() in one placeJiang Jiang2011-04-051-2/+1
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-314-27/+40
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-224-4/+70
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-091-8/+18
| | |\ \ \ | | | |_|/ | | |/| |
| | * | | Doc: Fixed qdoc warnings.David Boddie2011-03-011-1/+1
| | * | | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-2316-65/+342
| | |\ \ \
| | * | | | Doc: Fixed links and whitespace.David Boddie2011-02-172-3/+16
| | * | | | Merge branch 'jpasions-qt-doc-team-qtquick-4.7' into 4.7David Boddie2011-02-171-23/+23
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' into jpasions-qt-doc-team-qtquick-4.7David Boddie2011-01-253-14/+19
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-17143-183/+171
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-052-8/+20
| | | |\ \ \ \ \ \
| | | * | | | | | | Re-organized the Qt Quick page. Changed titles and links.Jerome Pasion2010-12-202-49/+49
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-0450-264/+1664
| | |\ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ Merge ../qt-qml-stagingYann Bodson2011-03-293-2/+16
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Fix warning about unused parameterThiago Macieira2011-03-271-1/+1
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-242-0/+14
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-03-222-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix compilation with QT_NO_Tasuku Suzuki2011-03-212-0/+14
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | Fix writing to an attached property from script.Michael Brasser2011-03-211-1/+1
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtAlan Alpert2011-03-233-2/+65
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-172-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Qt.include() used in WorkerScript is broken on Windows.Martin Jones2011-03-162-2/+2
| * | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-161-0/+63
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Remove bindings before assigning constants in VMEAaron Kennedy2011-03-151-0/+63
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-112-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Update copyright year to 2011.Rohan McGovern2011-03-102-2/+2
| * | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| / / / / / / / / / | | |/ / / / / / / / /
| | * | | | | | | | | Fix line information for dynamic slots in .qml filesKai Koehne2011-03-091-1/+4
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-011-8/+18
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | fix/improve docs for new QtQuick 1.1 attributesBea Lam2011-02-281-8/+18
| | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | Add Constant and Final flags to QMetaObjectBuilderBea Lam2011-03-142-1/+60
|/ / / / / / / /
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-284-35/+35
|\ \ \ \ \ \ \ \