summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Expand)AuthorAgeFilesLines
* Fixed warning by MSVC about class/struct mismatch in MethodData.Janne Anttila2012-02-031-1/+1
* Update year in Nokia copyright messages.Jason McDonald2012-01-11147-149/+149
* Declarative: Use qDebug() for debugger status updatesKai Koehne2011-11-281-1/+1
* Surviving out of memory in Qt Quick appmread2011-11-213-51/+59
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-256-62/+201
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-126-62/+201
| |\
| | * Backport more imports directory caching changes.Martin Jones2011-10-114-15/+20
| | * Backport imports directory caching performance optimizationMartin Jones2011-09-126-56/+190
* | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-10-1410-912/+34
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-072-2/+10
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-09-281-1/+1
| | |\ \
| | | * | Crash in QDeclarativeCompiler::indexOfPropertySami Merila2011-09-271-1/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-09-211-1/+9
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/|
| | | * QML import path puts Qt dirs in correct Symbian ordermread2011-09-211-1/+9
| * | | Fix assertAaron Kennedy2011-09-281-1/+1
| * | | Compile fix for SymbianAaron Kennedy2011-09-211-4/+4
| * | | Merge remote-tracking branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2011-09-209-900/+14
| |\ \ \
| | * | | Rename QDeclarativeEngineDebugServer to ~ServiceKai Koehne2011-09-165-889/+6
| | * | | Debugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.hKai Koehne2011-09-152-11/+1
| * | | | Fix aliasing bug when compiled with gcc 4.6Aaron Kennedy2011-09-151-9/+16
* | | | | Fix QDeclarativeEngine::setOfflineStoragePath() for SymbianMiikka Heikkinen2011-10-101-1/+1
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-09-153-4/+12
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Fix crash in compiled bindingsAaron Kennedy2011-09-143-4/+12
* | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-09-071-0/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Fix leak in bindings created by PropertyChanges.Michael Brasser2011-09-011-0/+2
| | |/ | |/|
* | | Merge remote branch 'qt-doc-team/4.8'Casper van Donderen2011-08-291-0/+5
|\ \ \ | |_|/ |/| |
| * | Doc: Internalized QDeclarativeTypeLoaderGeir Vattekar2011-08-241-0/+5
| * | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-06-172-4/+13
| |\ \
| * \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-06-094-31/+32
| |\ \ \
| * \ \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-24149-2552/+2556
| |\ \ \ \
| * \ \ \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-167-30/+102
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-08-1110-186/+289
|\ \ \ \ \ \ \
| * | | | | | | Compile on symbianAaron Kennedy2011-08-041-1/+1
| * | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtAaron Kennedy2011-08-044-39/+48
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-06-221-2/+3
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-211-2/+3
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix crash in PropertyChanges.Michael Brasser2011-06-211-2/+3
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-211-0/+6
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-175-35/+45
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-092-4/+13
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-06-081-27/+28
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-06-011-27/+28
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / | | | | | |/| | | | | |
| | | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-011-27/+28
| | | | | |\ \ \ \ \ \ \ | | | | | | | |_|/ / / / | | | | | | |/| | | | |
| | | | | | * | | | | | QDeclarative: Fix QPerformanceTimer on SymbianKai Koehne2011-06-011-27/+28
| | | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-17149-2552/+2552
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | |
| | | | | | * | | | | | Update licenseheader text in source filesJyri Tahtela2011-05-13149-2552/+2552
| | | * | | | | | | | | Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-06149-2582/+2661
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-242-1/+4
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| | | | | * | | | | | | Merge remote branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2011-05-232-1/+4
| | | | | |\ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ | | | | | |/| | | | | |
| | | * | | | | | | | | Fixed inconsistent behaviour in Qt.rect().Kim Motoyoshi Kalland2011-05-201-3/+0
generated by cgit v0.12 at 2025-01-13 13:01:38 (GMT)