Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | QDeclarativeContext::contextProperty() should also access ids | Aaron Kennedy | 2010-03-04 | 1 | -1/+4 |
| | | | | QT-2800 | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-03 | 1 | -6/+19 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-03 | 19 | -106/+181 |
| |\ | |||||
| * | | Fix painting Rectangle with radius < side/2. | Martin Jones | 2010-03-03 | 1 | -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 Allison | 2010-03-03 | 2 | -3/+3 |
| | | | | | | | | | | | | Author: Erik Verbruggen | ||||
* | | | system import path not supported with Qt 4.6. | Warwick Allison | 2010-03-03 | 1 | -0/+4 |
| | | | |||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-03 | 19 | -106/+181 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Yann Bodson | 2010-03-03 | 4 | -20/+57 |
| |\ \ | |||||
| | * | | Save secondary scope inside the expression's scope object | Aaron Kennedy | 2010-03-03 | 4 | -20/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents the secondary scope from contaminating scopes outside itself when used as a signal expression. QTBUG-8641 | ||||
| * | | | More renaming: MouseRegion -> MouseArea | Yann Bodson | 2010-03-03 | 1 | -5/+5 |
| |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Yann Bodson | 2010-03-03 | 7 | -40/+65 |
| |\ \ | |||||
| | * | | QDeclarativeProperty::read() returns a QObjectStar when accessing a QObject ↵ | Aaron Kennedy | 2010-03-03 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | property QT-2793 | ||||
| | * | | Move JS global scope to top of the QML scope chain | Aaron Kennedy | 2010-03-03 | 6 | -38/+56 |
| | | | | | | | | | | | | | | | | QT-2787 | ||||
| * | | | 'on' syntax fixes | Yann Bodson | 2010-03-03 | 7 | -40/+40 |
| |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Yann Bodson | 2010-03-03 | 1 | -0/+5 |
| |\ \ | | |/ | |||||
| * | | Add documentation for the 'when' property of Binding. | Yann Bodson | 2010-03-03 | 1 | -1/+14 |
| | | | |||||
* | | | 4.6.x compat | Warwick Allison | 2010-03-03 | 1 | -0/+16 |
| |/ |/| | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-03-03 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Fix incorrect scope resolution for script in a script block. | Michael Brasser | 2010-03-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | | Make sure global variables in a script file are searched before component properties. Task-number: QTBUG-8641 | ||||
* | | QDeclarativeGuard should handle objects being deleted | Aaron Kennedy | 2010-03-03 | 1 | -0/+5 |
|/ | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2010-03-03 | 1 | -7/+13 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-03 | 1 | -1/+1 |
| |\ | |||||
| * | | Fix mouse stealing in nested flickables. | Martin Jones | 2010-03-03 | 1 | -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.7 | Bea Lam | 2010-03-03 | 23 | -1836/+175 |
|\ \ \ | | |/ | |/| | |||||
| * | | Initialize variable before use. | Michael Brasser | 2010-03-02 | 1 | -1/+1 |
| |/ | |||||
| * | Fix build of imports | Tobias Hunger | 2010-03-02 | 17 | -2744/+26 |
| | | | | | | | | | | | | * Fix export macro used in webkit * Fix dependencies on declarative/mutlimedia * Copy qmldir files into the build tree | ||||
| * | Compile fix on Windows | Alan Alpert | 2010-03-02 | 1 | -1/+1 |
| | | |||||
| * | Build fix on windows | Tobias Hunger | 2010-03-02 | 1 | -1/+1 |
| | | |||||
| * | Fix qml import modules loading on Windows | mae | 2010-03-02 | 1 | -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 imports | mae | 2010-03-02 | 17 | -26/+2744 |
| | | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-02 | 36 | -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.txt | Aaron Kennedy | 2010-03-02 | 1 | -0/+10 |
| | | | |||||
| | * | Don't return QDeclarativeDeclarativeData for a deleting object | Aaron Kennedy | 2010-03-02 | 2 | -2/+6 |
| | | | | | | | | | | | | This was causing crashes in the qmldesigner. | ||||
| | * | Empty URL test | Aaron Kennedy | 2010-03-02 | 1 | -0/+7 |
| | | | |||||
| | * | Merge branch 'master' into 4.7 | Warwick Allison | 2010-03-02 | 7 | -1785/+3 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp | ||||
| | | * | doc | Warwick Allison | 2010-03-02 | 1 | -0/+1 |
| | | | | |||||
| | | * | Move WebView to an extension plugin. | Warwick Allison | 2010-03-02 | 5 | -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-qml | Bea Lam | 2010-03-02 | 14 | -141/+325 |
| | | |\ | |||||
| | | | * | Add NOTIFY signals to list, grid and path views | Joona Petrell | 2010-03-02 | 8 | -36/+124 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: akennedy | ||||
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-03-01 | 2 | -4/+10 |
| | | |\ \ | |||||
| | | * | | | Export QDeclarativeWorkerScript and QDeclarativeWorkerListModel and | Bea Lam | 2010-03-01 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | call other usual macros. | ||||
| | * | | | | Optimization. | Michael Brasser | 2010-03-02 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Add NOTIFY signals to list, grid and path views | Joona Petrell | 2010-03-02 | 8 | -36/+124 |
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: akennedy | ||||
| * | | | | | doc: Fixed some qdoc errors. | Martin Smith | 2010-03-02 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Add WorkerScript docs and tests. | Bea Lam | 2010-03-03 | 1 | -1/+82 |
| |/ / / / |/| | | | | | | | | | | | | | | Task-number: QT-2807 | ||||
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2010-03-02 | 14 | -130/+253 |
|\ \ \ \ \ | |||||
| * | | | | | Add accessor operations to VisualItemModel::children | Aaron Kennedy | 2010-03-02 | 1 | -1/+10 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into 4.7 | Aaron Kennedy | 2010-03-02 | 6 | -105/+201 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Aaron Kennedy | 2010-03-02 | 3 | -6/+29 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/main.cpp demos/declarative/minehunt/minehunt.qml | ||||
| | * | | | | Make "on" syntax mandatory for value sources and interceptors | Aaron Kennedy | 2010-03-02 | 6 | -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. |