summaryrefslogtreecommitdiffstats
path: root/tests/auto
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-051504-0/+174888
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-052-0/+46
| |\
| | * Fix Behaviors for object-type properties.Michael Brasser2010-02-052-0/+46
| | | | | | | | | | | | Task-number: QT-2269
| * | Fix test.Martin Jones2010-02-051-2/+1
| |/
| * Fix bad merge (compile)Warwick Allison2010-02-051-83/+0
| |
| * 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-051-11/+27
| |/
| * 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-051504-0/+174910
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| | * Re-add accidentally deleted fileAaron Kennedy2010-02-041-0/+6
| | |
| | * Test SizeItemToLoader to SizeLoaderToItem resizeMode change.Martin Jones2010-02-041-0/+7
| | | | | | | | | | | | Task-number: QT-2376
| | * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-041503-0/+174897
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp
| | | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2010-02-04167-372/+1329
| | | |\ | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | * XMLHttpRequest redirectionAaron Kennedy2010-02-037-0/+149
| | | | |
| | | | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2010-02-036-0/+109
| | | | |\ | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | * Test case for QTBUG-7860Aaron Kennedy2010-02-032-0/+16
| | | | | |
| | | | | * Missing filesAaron Kennedy2010-02-033-0/+44
| | | | | |
| | | | | * Test for default property orderingAaron Kennedy2010-02-032-0/+49
| | | | | |
| | | | * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2010-02-0374-70/+776
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | into kinetic-declarativeui
| | | | | * Fix insertion and deletion of multiple items in GridView.Martin Jones2010-02-021-5/+7
| | | | | |
| | | | | * Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-02-0273-65/+769
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/linguist/lupdate/main.cpp
| | | | * | | Disallow ids that start with uppercase letters and update docs andBea Lam2010-02-0380-293/+288
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | examples accordingly. Task-number: QT-2786
| | | | * | Fix test timingsAlan Alpert2010-02-011-8/+7
| | | | | |
| | | | * | Revert "Qt has more stuff in rich text now."Alan Alpert2010-02-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3f095e957f27744c9c7a79679e35bfcc9db161fd.
| | | * | | Fix elision and multilength strings when resizing a Text element.Michael Brasser2010-02-0415-65/+2362
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | They were incorrectly wrapping when the width changed. Task-number: QTBUG-7477
| | | * | Support animating attached properties.Michael Brasser2010-02-012-0/+46
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5580
| | | * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2010-01-2919-54/+761
| | | |\ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * | Convert lists to variants on assignment.Aaron Kennedy2010-01-282-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-5675
| | | | * | Support builtin string converters in every contextAaron Kennedy2010-01-283-2/+298
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-6919
| | | | * | Assigning undefined resets QObject propertiesAaron Kennedy2010-01-283-1/+50
| | | | | |
| | | | * | Add reset methods to QmlMetaPropertyAaron Kennedy2010-01-281-0/+93
| | | | | |
| | | | * | Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2010-01-2714-50/+299
| | | | |\ \
| | | * | | | Don't crash when accessing index -1Martin Jones2010-01-291-1/+5
| | | |/ / /
| | | * | | Replace FreeMono by OCRA fontMartin Jones2010-01-278-90/+90
| | | | | |
| | | * | | Test QML doesn't hijack JS ObjectAaron Kennedy2010-01-252-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-5759
| | | * | | Support attached properties in QmlMetaPropertyAaron Kennedy2010-01-251-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-5580
| | | * | | Allow composite value sourcesAaron Kennedy2010-01-213-2/+35
| | | | | |
| | | * | | Rename ListModel::set() to ListModel::setProperty()Aaron Kennedy2010-01-201-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As QML doesn't support slot overloading, the two ListModel::set() calls must be separated.
| | | * | | Keep empty lists and 1-item lists as lists instead of converting themBea Lam2010-01-201-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to null or single objects. This brings back change bc6940f with additional fixes and tests.
| | | * | | Revert previous change. Does not work for statically defined list models.Bea Lam2010-01-201-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bc6940f53891856a3a6c3d8f1c25a8eaada90b33.
| | | * | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2010-01-202-1/+19
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | * | | Add support for aliases in test http server.Martin Jones2010-01-202-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes it possible to request many files with unique names, but serve a single file.
| | | * | | | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-2012-12/+108
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp
| | | * | | | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-1916-877/+379
| | | |\ \ \ \