summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-102-9/+16
|\
| * Make sure item release isn't deferred indefinatelyMartin Jones2010-02-102-9/+16
* | Attempt to clairify highlight range docsAlan Alpert2010-02-101-0/+10
|/
* CrashAaron Kennedy2010-02-101-0/+2
* Revert "Remove unimplemented methods from header"Martin Jones2010-02-101-0/+2
* Revert "Replace QList<>* support with QmlListProperty"Martin Jones2010-02-1019-215/+318
* Remove unimplemented methods from headerKai Koehne2010-02-091-2/+0
* Properly insert objects into the context's object listAlan Alpert2010-02-091-0/+1
* Replace QList<>* support with QmlListPropertyAaron Kennedy2010-02-0919-318/+215
* Remove old implicit module support.Warwick Allison2010-02-092-14/+16
* 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-088-49/+113
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-084-4/+26
| |\
| | * 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
| * | Support the other validatorsAlan Alpert2010-02-082-0/+23
| * | Document QtObjectAlan Alpert2010-02-081-0/+19
| |/
| * XMLHttpRequest collection bugAaron Kennedy2010-02-081-45/+45
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-083-0/+51
|\ \ | |/
| * The virtual keyboard is now working for TextEdit and TextInput components.Alexis Menard2010-02-083-0/+51
* | For local fonts, we can just addApplicationFont() rather than loading data.Martin Jones2010-02-081-4/+10
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-082-14/+14
|\
| * Make transformOrigin Center by defaultYann Bodson2010-02-082-14/+14
* | Fix viewport size update.Martin Jones2010-02-081-2/+4
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlYann Bodson2010-02-087-75/+83
|\
| * Allow objects to be shared between QmlEnginesAaron Kennedy2010-02-087-75/+83
* | clip if tile mode is 'PreserveAspectCrop' and 'clip' property is true.Yann Bodson2010-02-081-3/+9
|/
* 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
|\
| * Fix private header include.Bea Lam2010-02-081-1/+1
* | Make atBeginning/viewArea calculations account for min extent.Martin Jones2010-02-081-6/+6
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0513-96/+95
|\
| * Fix Behaviors for object-type properties.Michael Brasser2010-02-052-3/+2
| * Pass symbols::prefix (Action -> QmlAction)Warwick Allison2010-02-0511-93/+93
* | Fix test.Martin Jones2010-02-051-7/+17
|/
* Fix ListView tests.Martin Jones2010-02-051-4/+6
* Clean up QmlImageReader thread on engine destruction.Martin Jones2010-02-053-12/+21
* Test SizeItemToLoader to SizeLoaderToItem resizeMode change.Martin Jones2010-02-041-0/+6
* Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-042-2/+4
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Michael Brasser2010-02-0434-363/+550
|\
| * Document margins propertyAlan Alpert2010-02-031-0/+2
| * doc: There is no easeNone, it is called easeLinearThorbjørn Lindeijer2010-02-031-1/+1
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2010-02-0329-356/+494
| |\
| | * 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-037-159/+138
| | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2010-02-031-12/+32
| | |\ \ | | | |/
| | | * XMLHttpRequest redirectionAaron Kennedy2010-02-031-12/+32
| | * | We use JavaScript, not ECMAScript.Martin Jones2010-02-032-3/+3
| | |/