summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* QDeclarativeContext::contextProperty() should also access idsAaron Kennedy2010-03-041-1/+4
| | | | QT-2800
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-031-6/+19
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-0319-106/+181
| |\
| * | Fix painting Rectangle with radius < side/2.Martin Jones2010-03-031-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | Falls back to using standard QPainter. Also avoid painting odd width borders between pixels, i.e. pixel align painting. Task-number: QTBUG-6675, QTBUG-8317, QTBUG-6786
* | | Fix visibility of classes in private headers upon which Bauhaus/Creator relies.Warwick Allison2010-03-032-3/+3
| | | | | | | | | | | | Author: Erik Verbruggen
* | | system import path not supported with Qt 4.6.Warwick Allison2010-03-031-0/+4
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-0319-106/+181
|\ \ \ | | |/ | |/|
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents the secondary scope from contaminating scopes outside itself when used as a signal expression. QTBUG-8641
| * | | 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 ↵Aaron Kennedy2010-03-031-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | property QT-2793
| | * | Move JS global scope to top of the QML scope chainAaron Kennedy2010-03-036-38/+56
| | | | | | | | | | | | | | | | QT-2787
| * | | '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
| |\ \ | | |/
| * | Add documentation for the 'when' property of Binding.Yann Bodson2010-03-031-1/+14
| | |
* | | 4.6.x compatWarwick Allison2010-03-031-0/+16
| |/ |/|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-031-0/+1
|\ \ | |/
| * Fix incorrect scope resolution for script in a script block.Michael Brasser2010-03-031-0/+1
| | | | | | | | | | | | | | Make sure global variables in a script file are searched before component properties. Task-number: QTBUG-8641
* | QDeclarativeGuard should handle objects being deletedAaron Kennedy2010-03-031-0/+5
|/
* 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
| | | | | | | | | | | | | | | | | | | | | Set intent to steal mouse, but don't steal the initiating event. This allows other, higher Flickables to override lower. Task-number: QTBUG-5292
* | | 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
| | | | | | | | | | | | * Fix export macro used in webkit * Fix dependencies on declarative/mutlimedia * Copy qmldir files into the build tree
| * 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
| | | | | | | | | | | | On windows, when importing a declarative plugin by name, extend with "d.dll" in the debug case, then with ".dll". This is in sync with qmake's behaviour for libraries.
| * 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
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (28 commits) Add "on" syntax to QmlChanges.txt Don't return QDeclarativeDeclarativeData for a deleting object Empty URL test Fix zooming (broke with transformOrigin default change). doc Move WebView to an extension plugin. follow syntax change missed file Optimization. Add autotests for script block scoping. Make test more reliable. Add NOTIFY signals to list, grid and path views Example of text focus. Add docs and tests for WorkerListModel. Add NOTIFY signals to list, grid and path views Example of text focus. Add accessor operations to VisualItemModel::children Make "on" syntax mandatory for value sources and interceptors Fix warning. Minor optimization. ...
| | * Add "on" syntax to QmlChanges.txtAaron Kennedy2010-03-021-0/+10
| | |
| | * Don't return QDeclarativeDeclarativeData for a deleting objectAaron Kennedy2010-03-022-2/+6
| | | | | | | | | | | | This was causing crashes in the qmldesigner.
| | * Empty URL testAaron Kennedy2010-03-021-0/+7
| | |
| | * Merge branch 'master' into 4.7Warwick Allison2010-03-027-1785/+3
| | |\ | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
| | | * docWarwick Allison2010-03-021-0/+1
| | | |
| | | * Move WebView to an extension plugin.Warwick Allison2010-03-025-1785/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using WebView now requires: import org.webkit 1.0 Task-number: QT-2995
| | | * 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
| | | | | | | | | | | | | | | | | | | | Reviewed-by: akennedy
| | | * | 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
| | | | | | | | | | | | | | | | | | | | | | | | call other usual macros.
| | * | | | Optimization.Michael Brasser2010-03-021-2/+2
| | | | | |
| | * | | | Add NOTIFY signals to list, grid and path viewsJoona Petrell2010-03-028-36/+124
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: akennedy
| * | | | | doc: Fixed some qdoc errors.Martin Smith2010-03-021-1/+1
| | | | | |
* | | | | | Add WorkerScript docs and tests.Bea Lam2010-03-031-1/+82
| |/ / / / |/| | | | | | | | | | | | | | Task-number: QT-2807
* | | | | 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
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/main.cpp demos/declarative/minehunt/minehunt.qml
| | * | | | Make "on" syntax mandatory for value sources and interceptorsAaron Kennedy2010-03-026-105/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Where you would have written x: NumberAnimation {} y: Behavior {} you now must write NumberAnimation on x {} Behavior on y {} This change also makes the parser more strict with respect to multiple assignments to a single property - they're no longer allowed. For example this x: 10 x: 11 is now an error.