summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixes: make qt-creator compileBill King2010-02-081-1/+1
|
* Fix autotest.Michael Brasser2010-02-082-0/+10
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-052592-35/+318503
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3324 commits) Fix test. Remove hacky fix (breaks autotest). Fix Behaviors for object-type properties. Pass symbols::prefix (Action -> QmlAction) Add license header. Fix bad merge (compile) Pass tst_headers::licenseCheck Fix ListView tests. Test fixes. More test fixes. Clean up QmlImageReader thread on engine destruction. Update test to handle QmlNetworkAccessManagerFactory Test fixes. Add a QEXPECT_FAIL for known bug. Fix autotest. Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. ...
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-052592-35/+318503
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3324 commits) Fix test. Remove hacky fix (breaks autotest). Fix Behaviors for object-type properties. Pass symbols::prefix (Action -> QmlAction) Add license header. Fix bad merge (compile) Pass tst_headers::licenseCheck Fix ListView tests. Test fixes. More test fixes. Clean up QmlImageReader thread on engine destruction. Update test to handle QmlNetworkAccessManagerFactory Test fixes. Add a QEXPECT_FAIL for known bug. Fix autotest. Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. ...
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0516-97/+141
| | |\
| | | * Remove hacky fix (breaks autotest).Michael Brasser2010-02-051-1/+0
| | | | | | | | | | | | | | | | Proper fix should be in 4.6 soon.
| | | * Fix Behaviors for object-type properties.Michael Brasser2010-02-054-3/+48
| | | | | | | | | | | | | | | | Task-number: QT-2269
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-051-1/+1
| | | |\
| | | * | Pass symbols::prefix (Action -> QmlAction)Warwick Allison2010-02-0511-93/+93
| | | | |
| | * | | Fix test.Martin Jones2010-02-052-9/+18
| | | |/ | | |/|
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-052-85/+2
| | |\ \ | | | |/ | | | | | | | | | | | | Conflicts: tests/benchmarks/declarative/painting/paintbenchmark.cpp
| | | * Fix bad merge (compile)Warwick Allison2010-02-051-83/+0
| | | |
| | | * Pass tst_headers::licenseCheckWarwick Allison2010-02-051-0/+40
| | | |
| | * | Add license header.Martin Jones2010-02-051-1/+41
| | |/
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0513-24/+24
| | |\
| | | * Test fixes.Michael Brasser2010-02-058-12/+12
| | | |
| | | * More test fixes.Michael Brasser2010-02-055-12/+12
| | | |
| | * | Fix ListView tests.Martin Jones2010-02-052-15/+33
| | |/
| | * Clean up QmlImageReader thread on engine destruction.Martin Jones2010-02-054-13/+22
| | |
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-054-2/+5
| | |\
| | | * Test fixes.Michael Brasser2010-02-053-2/+3
| | | |
| | | * Add a QEXPECT_FAIL for known bug.Michael Brasser2010-02-051-0/+2
| | | |
| | * | Update test to handle QmlNetworkAccessManagerFactoryMartin Jones2010-02-051-19/+22
| | |/
| | * Fix autotest.Michael Brasser2010-02-051-49/+43
| | | | | | | | | | | | The vme instruction set has changed.
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-052592-35/+318466
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3309 commits) Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. Document QmlContext ownership. Add bug note. Fix elision and multilength strings when resizing a Text element. Document calling C++ methods from QML. Document margins property Augment documentation doc: There is no easeNone, it is called easeLinear doc: Converted the basic types page to use \qmlbasictype Focus focusScope from focusing for focusOnPress Really run image reader in its own thread. Don't create one QNetworkAccessManager per XMLHttpRequest We use JavaScript, not ECMAScript. XMLHttpRequest redirection update Image.paintedWidth and Image.paintedHeight when the source changes Remove debug. ...
| | | * Add some painting benchmarks.Martin Jones2010-02-052-0/+282
| | | | | | | | | | | | | | | | Task-number: QT-2780
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-042-0/+46
| | | |\
| | | | * Fix headers::licenseCheck autotest failureLeonardo Sobral Cunha2010-02-041-0/+40
| | | | |
| | | | * Re-add accidentally deleted fileAaron Kennedy2010-02-041-0/+6
| | | | |
| | | * | Make sure cookies are saved.Martin Jones2010-02-041-1/+4
| | | |/
| | | * Test SizeItemToLoader to SizeLoaderToItem resizeMode change.Martin Jones2010-02-042-0/+13
| | | | | | | | | | | | | | | | Task-number: QT-2376
| | | * Document QmlContext ownership.Martin Jones2010-02-041-1/+4
| | | |
| | | * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-042589-35/+318119
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp
| | | | * Add bug note.Michael Brasser2010-02-041-1/+1
| | | | |
| | | | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2010-02-04404-1731/+4571
| | | | |\ | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2010-02-047-177/+310
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | | * Document margins propertyAlan Alpert2010-02-031-0/+2
| | | | | | |
| | | | | | * Augment documentationAlan Alpert2010-02-032-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Document automatic signal handlers and QmlViewer.Screen.
| | | | | | * doc: There is no easeNone, it is called easeLinearThorbjørn Lindeijer2010-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: dt
| | | | | | * doc: Converted the basic types page to use \qmlbasictypeMartin Smith2010-02-031-173/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes to qdoc3 to support this will be in the 4.7 master branch.
| | | | | | * Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2010-02-03383-1540/+4115
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | | * | Focus focusScope from focusing for focusOnPressAlan Alpert2010-02-032-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6739
| | | | | * | | Document calling C++ methods from QML.Martin Jones2010-02-041-0/+95
| | | | | | |/ | | | | | |/|
| | | | | * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2010-02-034-24/+42
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlengine.cpp
| | | | | | * | Don't create one QNetworkAccessManager per XMLHttpRequestAaron Kennedy2010-02-034-31/+49
| | | | | | | |
| | | | | * | | Really run image reader in its own thread.Martin Jones2010-02-038-163/+140
| | | | | | | |
| | | | | * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2010-02-038-12/+181
| | | | | |\ \ \ | | | | | | |/ / | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | | * | XMLHttpRequest redirectionAaron Kennedy2010-02-038-12/+181
| | | | | | | |
| | | | | * | | We use JavaScript, not ECMAScript.Martin Jones2010-02-0314-41/+41
| | | | | |/ / | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7720
| | | | | * | update Image.paintedWidth and Image.paintedHeight when the source changesYann Bodson2010-02-032-0/+5
| | | | | | |
generated by cgit v0.12 at 2025-08-26 02:20:16 (GMT)