Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use QUrl::fromLocalFile() instead of "file://" (i.e. only 2 slashes). | Bea Lam | 2010-02-08 | 32 | -200/+208 |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-08 | 3 | -2/+11 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-08 | 13 | -84/+119 |
| |\ | |||||
| | * | Fix autotest. | Michael Brasser | 2010-02-08 | 2 | -0/+10 |
| * | | Fix test. | Martin Jones | 2010-02-05 | 1 | -2/+1 |
* | | | Fix private header include. | Bea Lam | 2010-02-08 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-05 | 2592 | -35/+318503 |
|\ \ | |||||
| * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-05 | 2592 | -35/+318503 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-05 | 16 | -97/+141 |
| | |\ | |||||
| | | * | Remove hacky fix (breaks autotest). | Michael Brasser | 2010-02-05 | 1 | -1/+0 |
| | | * | Fix Behaviors for object-type properties. | Michael Brasser | 2010-02-05 | 4 | -3/+48 |
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-05 | 1 | -1/+1 |
| | | |\ | |||||
| | | * | | Pass symbols::prefix (Action -> QmlAction) | Warwick Allison | 2010-02-05 | 11 | -93/+93 |
| | * | | | Fix test. | Martin Jones | 2010-02-05 | 2 | -9/+18 |
| | | |/ | | |/| | |||||
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-05 | 2 | -85/+2 |
| | |\ \ | | | |/ | |||||
| | | * | Fix bad merge (compile) | Warwick Allison | 2010-02-05 | 1 | -83/+0 |
| | | * | Pass tst_headers::licenseCheck | Warwick Allison | 2010-02-05 | 1 | -0/+40 |
| | * | | Add license header. | Martin Jones | 2010-02-05 | 1 | -1/+41 |
| | |/ | |||||
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-05 | 13 | -24/+24 |
| | |\ | |||||
| | | * | Test fixes. | Michael Brasser | 2010-02-05 | 8 | -12/+12 |
| | | * | More test fixes. | Michael Brasser | 2010-02-05 | 5 | -12/+12 |
| | * | | Fix ListView tests. | Martin Jones | 2010-02-05 | 2 | -15/+33 |
| | |/ | |||||
| | * | Clean up QmlImageReader thread on engine destruction. | Martin Jones | 2010-02-05 | 4 | -13/+22 |
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-05 | 4 | -2/+5 |
| | |\ | |||||
| | | * | Test fixes. | Michael Brasser | 2010-02-05 | 3 | -2/+3 |
| | | * | Add a QEXPECT_FAIL for known bug. | Michael Brasser | 2010-02-05 | 1 | -0/+2 |
| | * | | Update test to handle QmlNetworkAccessManagerFactory | Martin Jones | 2010-02-05 | 1 | -19/+22 |
| | |/ | |||||
| | * | Fix autotest. | Michael Brasser | 2010-02-05 | 1 | -49/+43 |
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-05 | 2592 | -35/+318466 |
| | |\ | |||||
| | | * | Add some painting benchmarks. | Martin Jones | 2010-02-05 | 2 | -0/+282 |
| | | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-04 | 2 | -0/+46 |
| | | |\ | |||||
| | | | * | Fix headers::licenseCheck autotest failure | Leonardo Sobral Cunha | 2010-02-04 | 1 | -0/+40 |
| | | | * | Re-add accidentally deleted file | Aaron Kennedy | 2010-02-04 | 1 | -0/+6 |
| | | * | | Make sure cookies are saved. | Martin Jones | 2010-02-04 | 1 | -1/+4 |
| | | |/ | |||||
| | | * | Test SizeItemToLoader to SizeLoaderToItem resizeMode change. | Martin Jones | 2010-02-04 | 2 | -0/+13 |
| | | * | Document QmlContext ownership. | Martin Jones | 2010-02-04 | 1 | -1/+4 |
| | | * | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso... | Warwick Allison | 2010-02-04 | 2589 | -35/+318119 |
| | | |\ | |||||
| | | | * | Add bug note. | Michael Brasser | 2010-02-04 | 1 | -1/+1 |
| | | | * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int... | Michael Brasser | 2010-02-04 | 404 | -1731/+4571 |
| | | | |\ | |||||
| | | | | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Martin Jones | 2010-02-04 | 7 | -177/+310 |
| | | | | |\ | |||||
| | | | | | * | Document margins property | Alan Alpert | 2010-02-03 | 1 | -0/+2 |
| | | | | | * | Augment documentation | Alan Alpert | 2010-02-03 | 2 | -0/+32 |
| | | | | | * | doc: There is no easeNone, it is called easeLinear | Thorbjørn Lindeijer | 2010-02-03 | 1 | -1/+1 |
| | | | | | * | doc: Converted the basic types page to use \qmlbasictype | Martin Smith | 2010-02-03 | 1 | -173/+257 |
| | | | | | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Alan Alpert | 2010-02-03 | 383 | -1540/+4115 |
| | | | | | |\ | |||||
| | | | | | * | | Focus focusScope from focusing for focusOnPress | Alan Alpert | 2010-02-03 | 2 | -3/+18 |
| | | | | * | | | Document calling C++ methods from QML. | Martin Jones | 2010-02-04 | 1 | -0/+95 |
| | | | | | |/ | | | | | |/| | |||||
| | | | | * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Martin Jones | 2010-02-03 | 4 | -24/+42 |
| | | | | |\ \ | |||||
| | | | | | * | | Don't create one QNetworkAccessManager per XMLHttpRequest | Aaron Kennedy | 2010-02-03 | 4 | -31/+49 |
| | | | | * | | | Really run image reader in its own thread. | Martin Jones | 2010-02-03 | 8 | -163/+140 |