summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeengine.cpp
Commit message (Expand)AuthorAgeFilesLines
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
* Declarative: Use qDebug() for debugger status updatesKai Koehne2011-11-281-1/+1
* Surviving out of memory in Qt Quick appmread2011-11-211-2/+2
* Rename QDeclarativeEngineDebugServer to ~ServiceKai Koehne2011-09-161-4/+4
* Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtAaron Kennedy2011-08-041-3/+0
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-091-3/+0
| |\
| * \ Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-061-35/+52
| |\ \
| * | | Fixed inconsistent behaviour in Qt.rect().Kim Motoyoshi Kalland2011-05-201-3/+0
* | | | Fix alias warnings in QDeclarativeGuardAaron Kennedy2011-07-291-1/+1
| |_|/ |/| |
* | | Fix docs on caching for images loaded by image providersBea Lam2011-06-021-3/+0
| |/ |/|
* | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
* | Augment documentationAlan Alpert2011-05-091-0/+2
* | Removed some trailing whitespaceThorbjørn Lindeijer2011-05-041-17/+17
* | Introduced a CONFIG option that enables declarative debug servicesThorbjørn Lindeijer2011-05-041-0/+11
* | Moved the QML Observer Service and related functionality into QtThorbjørn Lindeijer2011-05-041-1/+5
|/
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-1/+1
|\
| * Doc: Fixed qdoc warnings.David Boddie2011-03-011-1/+1
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-6/+17
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-101-1/+2
| |\
| | * Update modules-related tests and docsBea Lam2011-02-101-1/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-071-1/+1
| |\ \ | | |/
| | * Clarify case preservation in QDeclarativeImageProvidersAlan Alpert2011-02-041-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-02-041-4/+14
| |\ \ | | |/ | |/|
| | * Doc: Fixed invalid/incomplete QML code snippets.David Boddie2011-01-171-4/+14
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-041-27/+255
|\ \ \ | |/ /
| * | Move Qt.application docs into Qt global object pageBea Lam2011-02-021-4/+56
| * | Implement property versioning inside the declarative engineAaron Kennedy2011-01-271-0/+121
| * | Add location information for tracing.Michael Brasser2011-01-251-2/+8
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191-1/+1
| |\ \ | | |/
| * | Fix Qt.formatTime() to accept QTime valuesBea Lam2011-01-111-22/+64
| * | Introduce Qt.application.active propertyJoona Petrell2011-01-071-0/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-071-4/+8
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2010-12-131-0/+30
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2010-12-011-27/+33
| |\ \ \ \
| * | | | | Add additional trace range data.Michael Brasser2010-11-191-0/+1
| * | | | | Add additional tracing.Michael Brasser2010-11-191-1/+3
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-201-4/+8
|\ \ \ \ \ | |/ / / /
| * | | | Don't truncate image:// url strings prematurelyBea Lam2010-12-201-4/+8
| | |_|/ | |/| |
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-131-0/+27
|\ \ \ \ | |/ / /
| * | | Qt.include() docs weren't being picked up by qdocBea Lam2010-12-061-0/+27
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-27/+36
|\ \ \ \ | |/ / /
| * | | Mention that image providers should be added before loading QML filesBea Lam2010-12-031-0/+3
| | |/ | |/|
| * | 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/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-261-1/+2
| | |\ \
| | | * | Declarative: Fix compiler warnings (Linux/g++)Friedemann Kleint2010-11-261-1/+2
| | | |/
| * | | Correctly handle CppOwnership even when a QDeclarativeData doesn't existAaron Kennedy2010-11-301-3/+1
| * | | Fix warnings related to unused variables.Thiago Macieira2010-11-261-0/+2
| |/ /
| * | Fix type punning warnings from gccAaron Kennedy2010-11-261-23/+30
| |/