summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-251-3/+3
|\
| * Fixes for the manifest and links.Casper van Donderen2011-11-241-3/+3
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-244-52/+60
|\ \
| * | Surviving out of memory in Qt Quick appmread2011-11-213-51/+59
| * | Merge remote-tracking branch 'qt/4.8'Pasi Pentikainen2011-11-171-16/+41
| |\ \ | | |/
| * | Fix alignment of non-wrapped richtext QML Text elements.Miikka Heikkinen2011-11-161-1/+1
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-11-231-7/+8
|\ \ \ | |_|/ |/| |
| * | Merge remote-tracking branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2011-11-221-7/+8
| |\ \
| | * | DeclarativeDebugServer: Instantiate QPluginLoader on heapAurindam Jana2011-11-171-7/+8
| | * | Properly protect access to pixmap reader thread with mutexChris Adams2011-11-141-16/+41
| * | | Properly protect access to pixmap reader thread with mutexChris Adams2011-11-151-16/+41
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-151-16/+41
|\ \ \ \ | |_|_|/ |/| | |
| * | | Properly protect access to pixmap reader thread with mutexChris Adams2011-11-151-16/+41
* | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-312-0/+25
|\ \ \ \
| * | | | Adding items to a view with no delegate crashes.Martin Jones2011-10-272-0/+25
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-259-80/+235
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-171-2/+3
| |\ \ \
| | * | | Fix crash on exit when overriding signal handlers in states.Michael Brasser2011-10-171-2/+3
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-122-15/+10
| |\ \ \ \ | | |/ / /
| | * | | Cannot flick to the end of a horizontal list view width LayoutMirroringMartin Jones2011-10-122-15/+10
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-128-63/+222
| |\ \ \ \ | | |/ / /
| | * | | Backport more imports directory caching changes.Martin Jones2011-10-114-15/+20
| | * | | Fix StrictlyEnforceRange with snapOneItem/Row and header behavior, pt 2Martin Jones2011-09-142-1/+21
| | * | | Backport imports directory caching performance optimizationMartin Jones2011-09-126-56/+190
* | | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-10-1416-90/+168
|\ \ \ \ \
| * \ \ \ \ 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
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-10-0414-88/+158
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | QDeclarativeDebug: Fix autotest breakage in qdeclarativedebugjsKai Koehne2011-09-291-3/+7
| | * | | | | 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-2022-85/+183
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Debugger: Rename qdeclarativedebug* to qdeclarativeenginedebug*Kai Koehne2011-09-163-6/+6
| | | * | | | Rename QDeclarativeEngineDebugServer to ~ServiceKai Koehne2011-09-167-58/+58
| | | * | | | Debugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.hKai Koehne2011-09-155-12/+71
| | * | | | | Fix aliasing bug when compiled with gcc 4.6Aaron Kennedy2011-09-151-9/+16
* | | | | | | Fix QDeclarativeEngine::setOfflineStoragePath() for SymbianMiikka Heikkinen2011-10-101-1/+1
* | | | | | | Converting accidental use of doubles to qreal in declarativemread2011-10-059-50/+50
|/ / / / / /
* | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-09-162-5/+8
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-09-1483-596/+2818
| |\ \ \ \ \ \ | | | |/ / / / | | |/| / / / | | |_|/ / / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-122-5/+8
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | StrictlyEnforceRange with snapOneItem/Row and header behavior changeMartin Jones2011-09-122-5/+8
* | | | | | 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-074-2/+18
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-074-2/+18
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Dragging in nested views no longer works as expectedMartin Jones2011-09-071-1/+1