summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \
* | | | | | | | | | 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 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
* | | | | | | | | | 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
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-284-35/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix compilation on INTEGRITYRolland Dudemaine2011-02-224-35/+35
* | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-238-26/+24
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-226-17/+22
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-203-3/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix warnings in QtDeclarativeThiago Macieira2011-02-173-3/+3
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-181-8/+10
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | Ensure animations start correctly when running is bound to a value.Michael Brasser2011-02-213-15/+10
| * | | | | | | | | | Ensure QDeclarativeListProperty docs are associated with QtDeclarative.Martin Jones2011-02-201-0/+1
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | QDeclarativeDebug: Fix crash when serializing list of QObjectsKai Koehne2011-02-161-8/+10
* | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-172-17/+80
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-142-17/+80
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Correct the "module not installed" error handlingAaron Kennedy2011-02-111-12/+13
| | * | | | | | | 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
* | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-109-38/+259
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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-081-12/+64
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Support seperate versions of installed modulesmae2011-02-081-12/+64