summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' into qmldocsDavid Boddie2010-09-071-7/+5
|\
| * Small cleanupAaron Kennedy2010-09-061-7/+5
* | Doc: More work on the QML documentation.David Boddie2010-09-071-1/+1
* | Merge branch '4.7' into qmldocsDavid Boddie2010-09-065-11/+29
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-035-12/+28
| |\
| | * qreal == float fixesAaron Kennedy2010-09-031-1/+1
| | * Don't modify the signal order on the second dynamic meta object passAaron Kennedy2010-09-031-4/+8
| | * Support passing QObject derived types to QML methodsAaron Kennedy2010-09-032-3/+15
| * | Complete Component::createObject() creation after setting the parent.Martin Jones2010-09-031-3/+5
* | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-033-8/+16
|\ \ \ | | |/ | |/|
| * | The declarative parser should only save comment text (and not /*,*/,//)Michael Brasser2010-09-011-4/+4
| * | Support for qsTrId and meta-data in comments for QML.Michael Brasser2010-09-011-1/+1
| |/
| * Support JS "in" operator on QML objectsAaron Kennedy2010-09-011-1/+1
| * Only emit change signal when variant properties actually changeAaron Kennedy2010-09-011-3/+11
* | Doc: Added types to method and signal documentation; other fixes.David Boddie2010-09-014-4/+13
|/
* Prevent calling deleteLater() from QMLAaron Kennedy2010-08-311-2/+2
* Ignore non-scriptable properties in QMLAaron Kennedy2010-08-313-13/+43
* Don't double call classBegin()Aaron Kennedy2010-08-311-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-08-311-0/+3
|\
| * Fix application exiting in embedded qml examplesJoona Petrell2010-08-301-0/+3
* | Simplify type management codeAaron Kennedy2010-08-2717-1186/+1470
* | QML JavaScript .import parserAaron Kennedy2010-08-272-0/+222
|/
* CleanupAaron Kennedy2010-08-273-13/+11
* Internal QML API cleanupAaron Kennedy2010-08-275-108/+124
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-251-9/+78
|\
| * Fix responseText to check the charset encoding field and also to notBea Lam2010-08-251-9/+78
* | Don't circumvent onDestruction handlers when clearing expression in delegate ...Martin Jones2010-08-252-3/+16
|/
* QDeclarativeDebug: send a message when new object are addedOlivier Goffart2010-08-243-2/+22
* QDeclarativeEngineDebugServer: make it a singleton.Olivier Goffart2010-08-243-9/+14
* Fix few declarative code issues discovered by static code analysisJoona Petrell2010-08-246-6/+6
* QDeclarativeDebug: stream all the context, including the internals ones.Olivier Goffart2010-08-201-4/+2
* Allow QML Quit buttons to work inside QtDemo.Alan Alpert2010-08-201-1/+1
* QDeclarativeImageProvider: Do not keep the global declarative mutex locked wh...Olivier Goffart2010-08-193-8/+13
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-162-5/+13
|\
| * QtDeclarative debugging: Add an option not to stream the properties of an obj...Olivier Goffart2010-08-162-5/+13
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-163-0/+4
|\ \
| * | qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-163-0/+4
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-132-8/+12
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-121-3/+4
| |\
| | * doc: The QML Qt element was missing from the documentation.Martin Smith2010-08-111-3/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-121-5/+8
| |\ \
| | * | Fix broken example codeBea Lam2010-08-121-5/+8
| | |/
| * | Merge commit 'remotes/origin/4.7' into qt47s2Thomas Zander2010-08-116-7/+7
| |\ \ | | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-103-10/+10
| |\ \
* | \ \ Merge branch '4.7' of ../oslo-staging-2 into 4.7David Boddie2010-08-135-14/+14
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-093-12/+15
| |\ \ \ | | | |/ | | |/|
| | * | QtDeclarative: get rid of warnings in public headerOlivier Goffart2010-08-092-6/+6
| | * | Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-091-6/+9
| | |\ \
| * | | | Doc: Fixes to Qt Quick documentation.David Boddie2010-08-092-4/+4
| |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-062-5/+1
| |\ \ \