summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵Qt Continuous Integration System2010-02-05314-9/+106257
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3309 commits) Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. Document QmlContext ownership. Add bug note. Fix elision and multilength strings when resizing a Text element. Document calling C++ methods from QML. Document margins property Augment documentation doc: There is no easeNone, it is called easeLinear doc: Converted the basic types page to use \qmlbasictype Focus focusScope from focusing for focusOnPress Really run image reader in its own thread. Don't create one QNetworkAccessManager per XMLHttpRequest We use JavaScript, not ECMAScript. XMLHttpRequest redirection update Image.paintedWidth and Image.paintedHeight when the source changes Remove debug. ...
| * Test SizeItemToLoader to SizeLoaderToItem resizeMode change.Martin Jones2010-02-041-0/+6
| | | | | | | | Task-number: QT-2376
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-04314-9/+106251
| |\ | | | | | | | | | | | | | | | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp
| | * Add bug note.Michael Brasser2010-02-041-1/+1
| | |
| | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2010-02-04102-686/+1222
| | |\ | | | | | | | | | | | | into kinetic-declarativeui
| | | * Document margins propertyAlan Alpert2010-02-031-0/+2
| | | |
| | | * doc: There is no easeNone, it is called easeLinearThorbjørn Lindeijer2010-02-031-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: dt
| | | * Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2010-02-0397-679/+1166
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2010-02-034-24/+42
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlengine.cpp
| | | | | * 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 ↵Martin Jones2010-02-031-12/+32
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | * XMLHttpRequest redirectionAaron Kennedy2010-02-031-12/+32
| | | | | |
| | | | * | We use JavaScript, not ECMAScript.Martin Jones2010-02-032-3/+3
| | | | |/ | | | | | | | | | | | | | | | Task-number: QTBUG-7720
| | | | * update Image.paintedWidth and Image.paintedHeight when the source changesYann Bodson2010-02-032-0/+5
| | | | |
| | | | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2010-02-031-2/+5
| | | | |\ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2010-02-035-25/+80
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | * | Don't enforce lower-case starting letters for ids yet; just print aBea Lam2010-02-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | warning for now.
| | | | * | | 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 ↵Bea Lam2010-02-035-17/+73
| | | | |\ | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | * 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
| | | | | |
| | | | * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2010-02-035-8/+15
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | into kinetic-declarativeui
| | | | | * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-031-2/+8
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2010-02-033-6/+6
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | | * | Fix Loader crash when Loader.item causes a new item to be loadedMartin Jones2010-02-031-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2338
| | | | | * | | Compile.Warwick Allison2010-02-034-6/+7
| | | | | | |/ | | | | | |/|
| | | | * | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2010-02-0376-445/+773
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-023-2/+31
| | | | | |\ \ | | | | | | |/ | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | | * Handle wheel events in Flickable.Martin Jones2010-02-023-2/+31
| | | | | | |
| | | | | * | The depot (4.6.2) does not have the Value patch yet, adjust version checksWarwick Allison2010-02-023-6/+6
| | | | | |/ | | | | | | | | | | | | | | | | | | accordingly.
| | | | | * Fix insertion and deletion of multiple items in GridView.Martin Jones2010-02-024-114/+72
| | | | | |
| | | | | * Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-02-0267-323/+664
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/linguist/lupdate/main.cpp
| | | | * | | Disallow ids that start with uppercase letters and update docs andBea Lam2010-02-032-3/+6
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | examples accordingly. Task-number: QT-2786
| | | | * | Fix QList<QObject*> as a model. Add docs and example.Martin Jones2010-02-011-2/+3
| | | | | |
| | | | * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2010-02-0111-10/+120
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | * | Tests for NaN values in the property x, y, widht and height setters ofMarco Bubke2010-02-012-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsItem and QmlGraphicsItem Task-number: BAUHAUS-268 Reviewed-by: Thomas Hartmann
| | | | | * | Add transformOriginChanged signal to QmlGraphicsItemMarco Bubke2010-02-012-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed that Bauhaus is reflecting the changes in QmlGraphicsItem. Task-number: BAUHAUS-125 Reviewed-by: Kai Koehne
| | | | * | | Compile on machines without SCHED_IDLEMartin Jones2010-02-011-1/+1
| | | | | | |
| | | * | | | Focus focusScope from focusing for focusOnPressAlan Alpert2010-02-032-3/+18
| | | | |/ / | | | |/| | | | | | | | | | | | | | Task-number: QTBUG-6739
| | | * | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-011-1/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | | Don't use statics for type definition, at least for plugin modules.Warwick Allison2010-02-013-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2798
| | * | | | | Fix elision and multilength strings when resizing a Text element.Michael Brasser2010-02-041-1/+10
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | They were incorrectly wrapping when the width changed. Task-number: QTBUG-7477
| | * | | | Support animating attached properties.Michael Brasser2010-02-011-1/+1
| | |/ / / | | | | | | | | | | | | | | | Task-number: QTBUG-5580
| | * | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-01239-5147/+7409
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/util/qmlpixmapcache.cpp