summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-0932-387/+313
|\
| * CompileAaron Kennedy2010-02-091-2/+2
| * Replace QList<>* support with QmlListPropertyAaron Kennedy2010-02-0924-350/+248
| * Remove old implicit module support.Warwick Allison2010-02-094-14/+29
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-091-3/+4
| |\
| | * Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/qt/qt-qmlBea Lam2010-02-0822-612/+523
| | |\
| | * | Connect to localhost instead of QHostAddress::Any. Fixes test on Windows.Bea Lam2010-02-081-3/+4
| * | | Use networkAccessManagerFactory() for worker threads too.Martin Jones2010-02-092-14/+20
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0813-565/+274
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-085-1/+148
| |\ \ \
| * | | | For local fonts, we can just addApplicationFont() rather than loading data.Martin Jones2010-02-081-4/+10
* | | | | Missed a fileAlan Alpert2010-02-091-0/+23
| |_|/ / |/| | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-085-511/+93
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-082593-35/+318808
| |\ \ \ \
| | * | | | Add getter functions to QAbstractDynamicMetaObject and QmlOpenMetaObjectTypeMarco Bubke2010-02-082-1/+23
| | * | | | Changed define name to reflect change in Creator.Erik Verbruggen2010-02-081-2/+2
| | * | | | re-enable QT_USE_FAST_CONCATENATIONErik Verbruggen2010-02-081-1/+1
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-081-507/+67
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-02-08171-957/+31224
| | |\ \ \ \ \
| | * | | | | | Performance: Use QImage's smoothscaling instead of old private codeaavit2010-02-051-507/+67
* | | | | | | | Support the other validatorsAlan Alpert2010-02-083-6/+112
* | | | | | | | Add empty constructor for validators.Alan Alpert2010-02-081-2/+3
* | | | | | | | Document QtObjectAlan Alpert2010-02-083-1/+21
| |_|_|/ / / / |/| | | | | |
* | | | | | | XMLHttpRequest collection bugAaron Kennedy2010-02-081-45/+45
| |_|_|_|/ / |/| | | | |
* | | | | | The virtual keyboard is now working for TextEdit and TextInput components.Alexis Menard2010-02-085-1/+148
| |_|_|/ / |/| | | |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-084-36/+25
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-082593-35/+318637
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlYann Bodson2010-02-081-5/+63
| | |\ \ \ \
| | * | | | | Make transformOrigin Center by defaultYann Bodson2010-02-082-14/+14
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-082-22/+11
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Replace qt_vg_imageBits() with constBits() in the OpenVG codeRhys Weatherley2010-02-082-22/+11
| |/ / / / /
* | | | | | Fix viewport size update.Martin Jones2010-02-081-2/+4
| |_|/ / / |/| | | |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-081-3/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlYann Bodson2010-02-0841-281/+342
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | clip if tile mode is 'PreserveAspectCrop' and 'clip' property is true.Yann Bodson2010-02-081-3/+9
* | | | | Better documentation of "model" and "modelData" in delegates.Martin Jones2010-02-081-5/+63
| |/ / / |/| | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0841-275/+320
|\ \ \ \
| * | | | Allow objects to be shared between QmlEnginesAaron Kennedy2010-02-089-75/+112
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-082-13/+13
| |\ \ \ \ | | |/ / /
| * | | | Use QUrl::fromLocalFile() instead of "file://" (i.e. only 2 slashes).Bea Lam2010-02-0832-200/+208
* | | | | Fix test.Martin Jones2010-02-081-6/+22
| |/ / / |/| | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-080-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBill King2010-02-081-6/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBill King2010-02-081-2/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Fixes: make qt-creator compileBill King2010-02-081-1/+1
* | | | | | Fix item removal.Martin Jones2010-02-081-7/+7
| |_|/ / / |/| | | |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-081-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-083-2/+11
| |\ \ \ \
| * | | | | Fix private header include.Bea Lam2010-02-081-1/+1
* | | | | | Make atBeginning/viewArea calculations account for min extent.Martin Jones2010-02-081-6/+6
| |/ / / / |/| | | |