summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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-084-36/+25
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-08314-9/+106290
| |\
| | * Make transformOrigin Center by defaultYann Bodson2010-02-082-14/+14
| * | 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-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-qml into master-integra...Qt Continuous Integration System2010-02-05314-9/+106276
|\ \ | |/ |/|
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-05314-9/+106276
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0514-97/+95
| | |\
| | | * Remove hacky fix (breaks autotest).Michael Brasser2010-02-051-1/+0
| | | * 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
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-05314-9/+106257
| | |\
| | | * 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-04314-9/+106251
| | | |\
| | | | * 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-04102-686/+1222
| | | | |\
| | | | | * 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-0397-679/+1166
| | | | | |\
| | | | | | * 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
| | | | | | |/
| | | | | | * update Image.paintedWidth and Image.paintedHeight when the source changesYann Bodson2010-02-032-0/+5
| | | | | | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2010-02-031-2/+5
| | | | | | |\
| | | | | | | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2010-02-035-25/+80
| | | | | | | |\
| | | | | | | * | Don't enforce lower-case starting letters for ids yet; just print aBea Lam2010-02-031-2/+5
| | | | | | * | | Remove debug.Martin Jones2010-02-031-4/+0
| | | | | | | |/ | | | | | | |/|
| | | | | | * | Add a PathView.onPath property to help deal with unrequested items.Martin Jones2010-02-032-15/+66
| | | | | | * | Avoid crash on shutdown if model is destroyed before view.Martin Jones2010-02-032-6/+10
| | | | | | * | Compile.Martin Jones2010-02-031-4/+4
| | | | | | |/
| | | | | | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2010-02-035-17/+73
| | | | | | |\
| | | | | | | * Honor default property orderingAaron Kennedy2010-02-031-2/+49
| | | | | | | * Fix compile on visual, changed NaN checks to use qIsNaN instead of isnan.Joona Petrell2010-02-032-6/+6
| | | | | | | * Ensure unrequested items are placed outside the visible area.Martin Jones2010-02-032-9/+18