summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix url in source() test.Bea Lam2010-03-031-1/+1
* Fix incorrect scope resolution for script in a script block.Michael Brasser2010-03-032-1/+1
* 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
| * | | 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
| * | | 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
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-02283-1113/+2490
|\ \
| * | Add minehunt READMEAlan Alpert2010-03-021-0/+3
| * | Refactor demosAlan Alpert2010-03-0236-5/+15
| * | 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
| * | Let the 'qml' runtime use its applicationDirPath as importsPathmae2010-03-021-0/+3
| * | 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
| |\ \
| | * | 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-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
| | |\ \
| | | * | Fix zooming (broke with transformOrigin default change).Warwick Allison2010-03-021-0/+1
| | | * | Merge branch 'master' into 4.7Warwick Allison2010-03-0249-273/+261
| | | |\ \
| | | | * | docWarwick Allison2010-03-021-0/+1
| | | | * | Move WebView to an extension plugin.Warwick Allison2010-03-0244-262/+257
| | | | * | 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
| | | | | * | Example of text focus.Warwick Allison2010-03-021-0/+83
| | | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-0132-51/+74
| | | | |\ \ \
| | | | * | | | Export QDeclarativeWorkerScript and QDeclarativeWorkerListModel andBea Lam2010-03-011-2/+8
| | | * | | | | Optimization.Michael Brasser2010-03-021-2/+2