summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add documentation for the 'when' property of Binding.Yann Bodson2010-03-031-1/+14
|
* Merge branch 'master' into 4.7Yann Bodson2010-03-035-0/+311
|\
| * add colorbrowser qml exampleYann Bodson2010-03-035-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 Brasser2010-03-032-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 Allison2010-03-031-0/+3
| |
* | silence debuggeryWarwick Allison2010-03-031-0/+2
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-031-1/+1
|\ \
| * | Add import Qt.widgets 4.6 to layout.qml exampleJoona Petrell2010-03-031-1/+1
| | |
* | | Fix settings (was not exported type).Warwick Allison2010-03-034-4/+8
| | |
* | | make runnable from elsewhereWarwick Allison2010-03-031-3/+3
| | |
* | | remove debuggerWarwick Allison2010-03-031-1/+0
| | |
* | | runnable from elsewhereWarwick Allison2010-03-031-1/+1
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-037-8/+322
|\ \
| * \ 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-033-4/+5
| | |\ \
| | * | | 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-03217-1531/+3399
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Add WorkerScript docs and tests.Bea Lam2010-03-036-1/+308
| | | | | | | | | | | | | | | | | | | | Task-number: QT-2807
| * | | | Forgot to add qworkerlistmodel test dir to declarative.proBea Lam2010-03-021-0/+1
| | | | |
* | | | | Ensure error is received - the root object is INITIALLY zero.Warwick Allison2010-03-031-0/+2
| |/ / / |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-032-4/+4
|\ \ \ \
| * | | | Initialize variable before use.Michael Brasser2010-03-021-1/+1
| | | | |
| * | | | Make test more reliable.Michael Brasser2010-03-021-3/+3
| | |/ / | |/| |
* | | | /src/imports/ now also contains plugins, so treat the same.Warwick Allison2010-03-031-0/+1
|/ / /
* | | Fix build of importsTobias Hunger2010-03-0224-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-integrationQt Continuous Integration System2010-03-02283-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 READMEAlan Alpert2010-03-021-0/+3
| | | |
| * | | Refactor demosAlan Alpert2010-03-0236-5/+15
| | | | | | | | | | | | | | | | Samegame and Twitter are now trying the new naming convention.
| * | | Rewrite Minehunt demo to use the runtime.Alan Alpert2010-03-0218-148/+62
| | | |
| * | | Adapted example to use the import mechanismmae2010-03-025-31/+40
| | | |
| * | | 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.
| * | | Let the 'qml' runtime use its applicationDirPath as importsPathmae2010-03-021-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 importsmae2010-03-0218-31/+51
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-02216-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. ...
| | * | | 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-024-0/+91
| | | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-02211-934/+2235
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (25 commits) 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. Test GridView.onAdd & GridView.onRemove. Reduce wait()s Replace remaining QGuard usage with QDeclarativeGuard. Reapply "Some animation cleanup/refactoring." ...
| | | * | | Fix zooming (broke with transformOrigin default change).Warwick Allison2010-03-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5845
| | | * | | Merge branch 'master' into 4.7Warwick Allison2010-03-0249-273/+261
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
| | | | * | docWarwick Allison2010-03-021-0/+1
| | | | | |
| | | | * | Move WebView to an extension plugin.Warwick Allison2010-03-0244-262/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using WebView now requires: import org.webkit 1.0 Task-number: QT-2995
| | | | * | follow syntax changeWarwick Allison2010-03-021-1/+1
| | | | | |
| | | | * | missed fileWarwick Allison2010-03-021-0/+0
| | | | | |
| | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-02137-599/+1351
| | | | |\ \
| | | | | * | Add NOTIFY signals to list, grid and path viewsJoona Petrell2010-03-0217-66/+815
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: akennedy
| | | | | * | Example of text focus.Warwick Allison2010-03-021-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-448
| | | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-0132-51/+74
| | | | |\ \ \
generated by cgit v0.12 at 2025-03-05 02:02:41 (GMT)