summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-034-20/+57
|\
| * Save secondary scope inside the expression's scope objectAaron Kennedy2010-03-034-20/+57
* | More renaming: MouseRegion -> MouseAreaYann Bodson2010-03-031-5/+5
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-037-40/+65
|\
| * QDeclarativeProperty::read() returns a QObjectStar when accessing a QObject p...Aaron Kennedy2010-03-031-2/+9
| * Move JS global scope to top of the QML scope chainAaron Kennedy2010-03-036-38/+56
* | 'on' syntax fixesYann Bodson2010-03-037-40/+40
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-031-0/+5
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-031-0/+1
| |\
| * | QDeclarativeGuard should handle objects being deletedAaron Kennedy2010-03-031-0/+5
* | | Add documentation for the 'when' property of Binding.Yann Bodson2010-03-031-1/+14
| |/ |/|
* | Fix incorrect scope resolution for script in a script block.Michael Brasser2010-03-031-0/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-031-7/+13
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-031-1/+1
| |\
| * | Fix mouse stealing in nested flickables.Martin Jones2010-03-031-7/+13
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0323-1836/+175
|\ \ \ | | |/ | |/|
| * | Initialize variable before use.Michael Brasser2010-03-021-1/+1
| |/
| * Fix build of importsTobias Hunger2010-03-0217-2744/+26
| * Compile fix on WindowsAlan Alpert2010-03-021-1/+1
| * Build fix on windowsTobias Hunger2010-03-021-1/+1
| * Fix qml import modules loading on Windowsmae2010-03-021-8/+20
| * Moved qdeclarativemodules to importsmae2010-03-0217-26/+2744
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0236-1959/+588
| |\
| | * Add "on" syntax to QmlChanges.txtAaron Kennedy2010-03-021-0/+10
| | * Don't return QDeclarativeDeclarativeData for a deleting objectAaron Kennedy2010-03-022-2/+6
| | * Empty URL testAaron Kennedy2010-03-021-0/+7
| | * Merge branch 'master' into 4.7Warwick Allison2010-03-027-1785/+3
| | |\
| | | * docWarwick Allison2010-03-021-0/+1
| | | * Move WebView to an extension plugin.Warwick Allison2010-03-025-1785/+0
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-0214-141/+325
| | | |\
| | | | * Add NOTIFY signals to list, grid and path viewsJoona Petrell2010-03-028-36/+124
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-012-4/+10
| | | |\ \
| | | * | | Export QDeclarativeWorkerScript and QDeclarativeWorkerListModel andBea Lam2010-03-011-2/+8
| | * | | | Optimization.Michael Brasser2010-03-021-2/+2
| | * | | | Add NOTIFY signals to list, grid and path viewsJoona Petrell2010-03-028-36/+124
| * | | | | doc: Fixed some qdoc errors.Martin Smith2010-03-021-1/+1
* | | | | | Add WorkerScript docs and tests.Bea Lam2010-03-031-1/+82
| |/ / / / |/| | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0214-130/+253
|\ \ \ \ \
| * | | | | Add accessor operations to VisualItemModel::childrenAaron Kennedy2010-03-021-1/+10
| * | | | | Merge branch 'master' into 4.7Aaron Kennedy2010-03-026-105/+201
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-03-023-6/+29
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Make "on" syntax mandatory for value sources and interceptorsAaron Kennedy2010-03-026-105/+201
| * | | | | Fix warning.Michael Brasser2010-03-021-1/+0
| * | | | | Minor optimization.Michael Brasser2010-03-021-2/+3
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-0212-23/+78
| |\ \ \ \ \
| | * | | | | Replace remaining QGuard usage with QDeclarativeGuard.Michael Brasser2010-03-014-5/+9
| | * | | | | Reapply "Some animation cleanup/refactoring."Michael Brasser2010-03-012-12/+20
| | * | | | | Setting the same source again causes reload.Martin Jones2010-03-011-4/+5
| * | | | | | Document TextEdit::textMarginAlan Alpert2010-03-011-0/+5
| | |_|/ / / | |/| | | |
* | | | | | Add docs and tests for WorkerListModel.Bea Lam2010-03-022-3/+143
| |/ / / / |/| | | |