summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use QUrl::fromLocalFile() instead of "file://" (i.e. only 2 slashes).Bea Lam2010-02-0832-200/+208
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-083-2/+11
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0813-84/+119
| |\
| | * Fix autotest.Michael Brasser2010-02-082-0/+10
| * | Fix test.Martin Jones2010-02-051-2/+1
* | | Fix private header include.Bea Lam2010-02-081-1/+1
| |/ |/|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-052592-35/+318503
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-052592-35/+318503
| |\ \ | | |/
| | * 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
| | | * Fix Behaviors for object-type properties.Michael Brasser2010-02-054-3/+48
| | | * 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
| | |\ \ | | | |/
| | | * 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
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-052592-35/+318466
| | |\
| | | * Add some painting benchmarks.Martin Jones2010-02-052-0/+282
| | | * 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
| | | * Document QmlContext ownership.Martin Jones2010-02-041-1/+4
| | | * Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-042589-35/+318119
| | | |\
| | | | * Add bug note.Michael Brasser2010-02-041-1/+1
| | | | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Michael Brasser2010-02-04404-1731/+4571
| | | | |\
| | | | | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2010-02-047-177/+310
| | | | | |\
| | | | | | * Document margins propertyAlan Alpert2010-02-031-0/+2
| | | | | | * Augment documentationAlan Alpert2010-02-032-0/+32
| | | | | | * doc: There is no easeNone, it is called easeLinearThorbjørn Lindeijer2010-02-031-1/+1
| | | | | | * doc: Converted the basic types page to use \qmlbasictypeMartin Smith2010-02-031-173/+257
| | | | | | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2010-02-03383-1540/+4115
| | | | | | |\
| | | | | | * | Focus focusScope from focusing for focusOnPressAlan Alpert2010-02-032-3/+18
| | | | | * | | Document calling C++ methods from QML.Martin Jones2010-02-041-0/+95
| | | | | | |/ | | | | | |/|
| | | | | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2010-02-034-24/+42
| | | | | |\ \
| | | | | | * | 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