summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-285-28/+37
|\
| * Use custom static scopes to improve QML/JavaScript performanceKent Hansen2010-06-255-28/+37
* | Merge branch '4.7' of /home/dboddie/git/oslo-staging-1 into 4.7David Boddie2010-06-251-1/+24
|\ \ | |/
| * DocAaron Kennedy2010-06-221-1/+24
* | Doc: Changed links to explicitly refer to QML objects.David Boddie2010-06-181-11/+11
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-171-1/+1
|\
| * Work around ICE in Intel C++ Compiler 11.1.072Thiago Macieira2010-06-161-1/+1
* | Move knowledge of QGraphicsObject out of qml engineAaron Kennedy2010-06-165-15/+46
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-126-13/+33
|\
| * Minor doc fixesBea Lam2010-06-111-1/+4
| * Doc improvements: move some example code to snippets, add screenshots,Bea Lam2010-06-092-6/+8
| * Move some example code into snippets/ and add other doc fixesBea Lam2010-06-092-6/+7
| * Keep reported point/pixel size in sync.Michael Brasser2010-06-072-0/+14
* | small optimisationLars Knoll2010-06-091-2/+2
* | Allow to build Qt in static with mingwThierry Bastian2010-06-071-1/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-033-3/+3
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-013-3/+3
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-013-3/+3
| | |\
| | | * QtDeclarative: Remove trailing commas in enumsThiago Macieira2010-05-313-3/+3
* | | | Add some Q_AUTOTEST_EXPORTsAaron Kennedy2010-06-032-2/+2
* | | | Doc fixes and improvements - fix some example code, link toBea Lam2010-06-021-3/+3
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-011-10/+24
|\ \ \ | |/ / |/| |
| * | Various doc fixes and improvementsBea Lam2010-05-311-10/+24
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-317-1/+23
|\ \ | |/ |/|
| * Fix QT_NO_TEXTDATE compilation errors.Andreas Aardal Hanssen2010-05-315-1/+16
| |\
| | * Fix QT_NO_TEXTDATETasuku Suzuki2010-05-255-1/+16
| * | Fix QT_NO_TEXTSTREAM compilation errors.Tasuku Suzuki2010-05-312-0/+7
* | | Rename QDeclarativeDebugTiming -> QDeclarativeDebugTraceAaron Kennedy2010-05-271-3/+4
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-272-58/+45
|\ \
| * | Doc fixes, improvementsBea Lam2010-05-261-58/+44
| * | Allow js files with '.pragma library' to be used from WorkerScriptBea Lam2010-05-261-0/+1
* | | Improve QML framerate debuggingAaron Kennedy2010-05-271-0/+8
|/ /
* | Revert "Reading/writing a non-existent property throws an exception"Aaron Kennedy2010-05-254-14/+26
* | Revert "Always pass context to QObject script class"Aaron Kennedy2010-05-254-9/+6
* | Always pass context to QObject script classAaron Kennedy2010-05-254-6/+9
* | Reading/writing a non-existent property throws an exceptionAaron Kennedy2010-05-254-26/+14
* | Added autotest for Component.createObject() without Qt.createComponent()Alan Alpert2010-05-242-5/+9
* | Compiler warningAaron Kennedy2010-05-241-1/+1
* | Remove incorrect ASSERTAaron Kennedy2010-05-241-3/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-242-1/+18
|\ \
| * | Don't crash when assigning a Behavior to a grouped property.Michael Brasser2010-05-242-1/+18
* | | Be slightly more verbose on assigning undefined in binding.Warwick Allison2010-05-241-1/+3
|/ /
* | Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivateBea Lam2010-05-246-52/+26
* | Allow resource files to be loaded in WorkerScriptBea Lam2010-05-241-3/+11
* | Component::createObject() don't attempt to set parent of null objectMartin Jones2010-05-241-4/+6
* | Ensure QML Global Qt object functions appear in the documentation indexWarwick Allison2010-05-212-3/+305
* | Remove warnings.Warwick Allison2010-05-201-2/+0
|/
* Be consistent in conversion from string (eg. color, int rounding).Warwick Allison2010-05-201-11/+14
* Simplify code to make next change clearer.Warwick Allison2010-05-201-14/+9
* Stop warnings.Warwick Allison2010-05-201-10/+10