summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-1/+1
|\
| * fix typo in error messagesOswald Buddenhagen2011-01-171-1/+1
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-172-0/+9
|\ \ | |/
| * Fix memory leakAaron Kennedy2011-01-141-0/+5
| * Clarify Component.createObject(null) behavior.Martin Jones2011-01-141-0/+4
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-17143-146/+146
|\ \ | |/
| * Don't crash Qt Creator when debugging an object aliasAaron Kennedy2011-01-131-1/+1
| * Update copyright year to 2011.Jason McDonald2011-01-10143-145/+145
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-233-13/+1
|\ \ | |/
| * WorkerScript could starve image loading of CPU.Martin Jones2010-12-231-1/+1
| * Improve QDeclarativeComponent test coverage.Michael Brasser2010-12-222-12/+0
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-202-8/+20
|\ \ | |/
| * Don't truncate image:// url strings prematurelyBea Lam2010-12-202-8/+20
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-202-21/+37
|\ \ | |/
| * QmlDebugger: Fix runtime warnings about unregistered metatypesKai Koehne2010-12-161-1/+4
| * Docs: implications of creating network access managers in other threadsBea Lam2010-12-141-20/+33
* | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-141-1/+1
|\ \
| * \ Merge remote branch 'origin/master' into file-engine-refactorJoão Abecasis2010-12-024-7/+16
| |\ \
| * | | QtDeclarative: make autotests compile on symbianShane Kearns2010-11-301-1/+1
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-136-47/+85
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix broken database creation caused by previous fixBea Lam2010-12-101-8/+17
| * | | QDeclarativeProperty doc improvementsBea Lam2010-12-091-3/+16
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-094-35/+45
| |\ \ \
| | * | | Fix openDatabaseSync() to not create unused directoryBea Lam2010-12-071-1/+0
| | * | | Some doc clarification for components and javascript integrationBea Lam2010-12-061-12/+16
| | * | | Qt.include() docs weren't being picked up by qdocBea Lam2010-12-062-22/+29
| * | | | Add libinfix support for QML plugins in Symbian.Miikka Heikkinen2010-12-091-1/+7
| |/ / /
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-0622-295/+678
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Mention that image providers should be added before loading QML filesBea Lam2010-12-031-0/+3
| * | Append qml import path individually for each available drive on SymbianJoona Petrell2010-12-021-1/+29
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-301-2/+1
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Joona Petrell2010-11-3018-258/+599
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-262-1/+3
| | |\ \ \
| | | * | | Declarative: Fix compiler warnings (Linux/g++)Friedemann Kleint2010-11-262-1/+3
| * | | | | Correct ownership semantics for QObject derived typesAaron Kennedy2010-11-301-2/+9
| * | | | | Correctly handle CppOwnership even when a QDeclarativeData doesn't existAaron Kennedy2010-11-301-3/+1
| | |_|/ / | |/| | |
| * | | | Improve consistency in handling of aliases, bindings and value typesAaron Kennedy2010-11-2917-256/+599
| * | | | Fix warnings related to unused variables.Thiago Macieira2010-11-262-1/+2
| |/ / /
| * | | Fix type punning warnings from gccAaron Kennedy2010-11-262-31/+35
| |/ /
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-254-7/+16
|\ \ \ | |/ / | | / | |/ |/|
| * Allow javascript date and regexp objects in WorkerScript messagesBea Lam2010-11-241-0/+13
| * Don't leak QML compiled data objectsAaron Kennedy2010-11-193-7/+3
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-193-4/+4
|\ \ | |/
| * Fix compilation by s/intptr_t/quintptr/Thiago Macieira2010-11-113-4/+4
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-129-23/+90
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-111-1/+2
| |\
| | * QDeclarativeDebug: Keep source information when changing an expressionChristiaan Janssen2010-11-101-1/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-101-1/+1
| |\ \ | | |/ | |/|
| | * Doc: Fixing typoSergio Ahumada2010-11-091-1/+1
| * | Don't use stdint.h in our headers since it is a C99 header.Martin Jones2010-11-082-12/+5