Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Save secondary scope inside the expression's scope object | Aaron Kennedy | 2010-03-03 | 5 | -22/+58 |
| | | | | | | | This prevents the secondary scope from contaminating scopes outside itself when used as a signal expression. QTBUG-8641 | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Yann Bodson | 2010-03-03 | 23 | -46/+166 |
|\ | |||||
| * | QDeclarativeProperty::read() returns a QObjectStar when accessing a QObject ↵ | Aaron Kennedy | 2010-03-03 | 5 | -2/+63 |
| | | | | | | | | | | | | property QT-2793 | ||||
| * | Move JS global scope to top of the QML scope chain | Aaron Kennedy | 2010-03-03 | 18 | -44/+103 |
| | | | | | | | | 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 | 6 | -35/+71 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-03 | 20 | -41/+388 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-03 | 6 | -0/+316 |
| | |\ | |||||
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-03-03 | 16 | -10/+329 |
| | | |\ | |||||
| | | * | | 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 | Warwick Allison | 2010-03-03 | 2 | -1/+1 |
| | |\ \ \ | |||||
| | * | | | | OS-friendlier, less noisy. | Warwick Allison | 2010-03-03 | 1 | -29/+52 |
| | | | | | | |||||
| | * | | | | fix crash, re-enable settings test | Warwick Allison | 2010-03-03 | 1 | -4/+2 |
| | | | | | | |||||
| * | | | | | Auto test for QTBUG-8677 | Martin Jones | 2010-03-03 | 3 | -2/+12 |
| | | | | | | |||||
* | | | | | | Add documentation for the 'when' property of Binding. | Yann Bodson | 2010-03-03 | 1 | -1/+14 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge branch 'master' into 4.7 | Yann Bodson | 2010-03-03 | 5 | -0/+311 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | add colorbrowser qml example | Yann Bodson | 2010-03-03 | 5 | -0/+311 |
| | | | | | | | | | | | | | | | | | | | | This example shows how to use qml packages to animate between pathview, gridview and listview. | ||||
* | | | | | Fix incorrect scope resolution for script in a script block. | Michael Brasser | 2010-03-03 | 2 | -1/+1 |
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Make sure global variables in a script file are searched before component properties. Task-number: QTBUG-8641 | ||||
* | | | | Disable until plugin objects problem resolved. | Warwick Allison | 2010-03-03 | 1 | -0/+3 |
| | | | | |||||
* | | | | silence debuggery | Warwick Allison | 2010-03-03 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-03 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Add import Qt.widgets 4.6 to layout.qml example | Joona Petrell | 2010-03-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix settings (was not exported type). | Warwick Allison | 2010-03-03 | 4 | -4/+8 |
| | | | | |||||
* | | | | make runnable from elsewhere | Warwick Allison | 2010-03-03 | 1 | -3/+3 |
| | | | | |||||
* | | | | remove debugger | Warwick Allison | 2010-03-03 | 1 | -1/+0 |
| | | | | |||||
* | | | | runnable from elsewhere | Warwick Allison | 2010-03-03 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-03 | 7 | -8/+322 |
|\ \ \ | | |/ | |/| | |||||
| * | | 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 | 3 | -4/+5 |
| | |\ \ | |||||
| | * | | | 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 | 217 | -1531/+3399 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Add WorkerScript docs and tests. | Bea Lam | 2010-03-03 | 6 | -1/+308 |
| | | | | | | | | | | | | | | | | | | | | Task-number: QT-2807 | ||||
| * | | | | Forgot to add qworkerlistmodel test dir to declarative.pro | Bea Lam | 2010-03-02 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Ensure error is received - the root object is INITIALLY zero. | Warwick Allison | 2010-03-03 | 1 | -0/+2 |
| |/ / / |/| | | | |||||
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-03 | 2 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | Initialize variable before use. | Michael Brasser | 2010-03-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Make test more reliable. | Michael Brasser | 2010-03-02 | 1 | -3/+3 |
| | |/ / | |/| | | |||||
* | | | | /src/imports/ now also contains plugins, so treat the same. | Warwick Allison | 2010-03-03 | 1 | -0/+1 |
|/ / / | |||||
* | | | Fix build of imports | Tobias Hunger | 2010-03-02 | 24 | -74/+150 |
| | | | | | | | | | | | | | | | | | | * Fix export macro used in webkit * Fix dependencies on declarative/mutlimedia * Copy qmldir files into the build tree | ||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-02 | 283 | -1113/+2490 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (37 commits) Add minehunt README Refactor demos Rewrite Minehunt demo to use the runtime. Adapted example to use the import mechanism Compile fix on Windows Build fix on windows Fix qml import modules loading on Windows Let the 'qml' runtime use its applicationDirPath as importsPath Moved qdeclarativemodules to imports 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 minehunt README | Alan Alpert | 2010-03-02 | 1 | -0/+3 |
| | | | | |||||
| * | | | Refactor demos | Alan Alpert | 2010-03-02 | 36 | -5/+15 |
| | | | | | | | | | | | | | | | | Samegame and Twitter are now trying the new naming convention. | ||||
| * | | | Rewrite Minehunt demo to use the runtime. | Alan Alpert | 2010-03-02 | 18 | -148/+62 |
| | | | | |||||
| * | | | Adapted example to use the import mechanism | mae | 2010-03-02 | 5 | -31/+40 |
| | | | | |||||
| * | | | 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. | ||||
| * | | | Let the 'qml' runtime use its applicationDirPath as importsPath | mae | 2010-03-02 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | The is analog to the plugin system in Qt. It makes it possible to ship an executable with extra plugins resp. qml import modules without creating a qt.conf. | ||||
| * | | | Moved qdeclarativemodules to imports | mae | 2010-03-02 | 18 | -31/+51 |
| | | | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-02 | 216 | -891/+2297 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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. ... |