summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-054-270/+8
|\
| * Remove unused, unexported class.Michael Brasser2010-10-043-260/+0
| * Qt.openUrlExternally should resolve relative URLs.Michael Brasser2010-10-011-9/+7
| * Documentation: input to Qt.rgba should be from 0-1, not 0-255.Michael Brasser2010-10-011-1/+1
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-0413-169/+60
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-291-146/+3
| |\
| | * Remove unused AST node destructors.Michael Brasser2010-09-281-146/+3
| * | Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-295-6/+6
| * | Register QtQuick 1.0 module.Aaron Kennedy2010-09-292-7/+17
| |/
| * If a type is registered under several names, share the attached property objectAaron Kennedy2010-09-286-10/+34
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-288-129/+9
|\ \ | |/
| * Fix assert when placing a .qml file inside $QTDIR/importsKai Koehne2010-09-271-0/+1
| * Fix test.Michael Brasser2010-09-271-0/+4
| * More declarative autotests.Michael Brasser2010-09-241-1/+1
| * Improve docs for Qt.quit()Bea Lam2010-09-231-1/+3
| * Remove unused, unexported class.Michael Brasser2010-09-234-127/+0
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-2111-14/+34
|\ \ | |/
| * Fix warningsThomas Zander2010-09-161-1/+1
| * Compile fix for static build using mingw.Michael Brasser2010-09-161-1/+1
| * crashfix for tst_qdeclarativeanimations::badTypes()Thomas Hartmann2010-09-151-1/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-154-2/+21
| |\
| | * This patch allows modifications on PropertyChanges on the flyThomas Hartmann2010-09-144-2/+21
| * | Rename "interface" in qdeclarativeinterface.h to "qmlInterface"Rhys Weatherley2010-09-151-2/+2
| |/
| * I18n: Fix some lupdate warnings.Friedemann Kleint2010-09-141-4/+4
| * Fix compile warnings.Friedemann Kleint2010-09-143-4/+4
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1024-1232/+1804
|\ \ | |/
| * 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
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-307-121/+135
|\ \ | |/
| * CleanupAaron Kennedy2010-08-273-13/+11