summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make sure the image reader thread is shutdown properlyMartin Jones2010-03-291-2/+14
| | | | | Prevents deadlock on shutdown for very shortlived runs, e.g. autotests
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-299-29/+32
|\
| * Doc fixesBea Lam2010-03-291-5/+13
| |
| * Remove references to qmlviewer in docs.Bea Lam2010-03-298-23/+18
| |
| * Fix doc linkBea Lam2010-03-291-1/+1
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-29690-318/+475
|\ \ | |/
| * Run a subset of 'stable' visual tests.Michael Brasser2010-03-282-3/+12
| |
| * Rename visual test to qmlvisual.Michael Brasser2010-03-28676-24/+17
| |
| * Syntax and other small fixes for the visual tests.Michael Brasser2010-03-2821-177/+192
| |
| * Autotest tweaks.Michael Brasser2010-03-285-2/+45
| |
| * Cleanup.Michael Brasser2010-03-282-30/+8
| |
| * Don't set status to Ready until model has been created (currently thisBea Lam2010-03-283-64/+183
| | | | | | | | | | | | | | | | | | | | is set as soon as XML data is downloaded, so there is no notification when model is actually ready to be used). This also fixes data() to not crash if it is called before the model is ready. Task-number: QTBUG-7835
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2843-151/+399
|\ \ | |/
| * Fix qdeclarativeimage autotest on the mac.Yann Bodson2010-03-283-2/+9
| |
| * QTBUG-9367 has been fixed. Expect pass.Warwick Allison2010-03-281-1/+0
| |
| * Source resizing for QDeclarativeImageProvider too.Warwick Allison2010-03-286-16/+32
| | | | | | | | (fixes test too)
| * tyopWarwick Allison2010-03-281-1/+1
| |
| * Installed imports are no longer searched relative to caller.Warwick Allison2010-03-281-0/+1
| | | | | | | | (quoted URL is for that)
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-26183-1338/+3827
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (77 commits) Recompute the source location of regexp literals. Adds a way to clear the state list property in QDeclarativeStateGroup I've been told this fixes compilation on windows. Doc Augmentation Added highlight ranges/modes to PathView Use QThread IdlePriority rather than linux platform code. Test and fix order of transform application. Test transforms. Fix namespace. Simple case, no size returned. sourceWidth/sourceHeight -> sourceSize QDeclarativeItem don't need to emit childrenChanged anymore. Control of image rendered size (esp. SVG). Do not call parent implementation if we accept the keyPressEvent in GridView and ListView delegates. Update test. Add autotest for QTBUG-9367. Remove Q prefix from the validators. Really fix qMin() parameter types. Add declarative subdir to examples.pro Add Symbian deploy section for qml import plugins ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-26183-1338/+3827
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (77 commits) Recompute the source location of regexp literals. Adds a way to clear the state list property in QDeclarativeStateGroup I've been told this fixes compilation on windows. Doc Augmentation Added highlight ranges/modes to PathView Use QThread IdlePriority rather than linux platform code. Test and fix order of transform application. Test transforms. Fix namespace. Simple case, no size returned. sourceWidth/sourceHeight -> sourceSize QDeclarativeItem don't need to emit childrenChanged anymore. Control of image rendered size (esp. SVG). Do not call parent implementation if we accept the keyPressEvent in GridView and ListView delegates. Update test. Add autotest for QTBUG-9367. Remove Q prefix from the validators. Really fix qMin() parameter types. Add declarative subdir to examples.pro Add Symbian deploy section for qml import plugins ...
| | | * Recompute the source location of regexp literals.Roberto Raggi2010-03-263-3/+15
| | | | | | | | | | | | | | | | Task-number: QTBUG-9367
| | | * Adds a way to clear the state list property in QDeclarativeStateGroupKai Koehne2010-03-261-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed by QmlDesigner, which needs to be able to remove states at runtime. Done my Marco Bubke Reviewed-by: Michael Brasser
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-269-69/+297
| | | |\
| | | * | I've been told this fixes compilation on windows.Alan Alpert2010-03-261-1/+1
| | | | |
| | | * | Doc AugmentationAlan Alpert2010-03-262-1/+16
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9396
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-26334-14194/+14777
| | | |\ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-253-13/+13
| | | |\ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-25240-1975/+4127
| | | |\ \ \ \
| | | * | | | | Forgot to add a file.Alan Alpert2010-03-251-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgot to add these, the primary changes, to commit 870dbc7542beb07b84378f356cbe568a2ae8b7e1
| | | * | | | | Add an initial attempt at docs on the new runtime and imports.Alan Alpert2010-03-253-61/+161
| | | | | | | |
| | | * | | | | Tweak import behaviourAlan Alpert2010-03-255-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implicit import of types in the same directory/module now imports version -1 (which means all versions). This fixes the Twitter demo. Additionally, the current directory is not added to the imports path. No functionality is lost, as you can import local modules with relative paths for the same effect. Improved docs are on the way. Reviewed-by: mae
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-265-5/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Qualify ptrdiff_t's namespace in stltest configure test Fix the bug where the ampersand symbol would be discarded. QtScript: Add missing API shim for signal handling Designer: Fix broken resource view filtering.
| | * | | | | | Qualify ptrdiff_t's namespace in stltest configure testJoão Abecasis2010-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago Macieira Task-number: QTBUG-9046
| | * | | | | | Fix the bug where the ampersand symbol would be discarded.Fabien Freling2010-03-262-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are now checking that the QAction is not related to the About or Quit button on Mac OS X Task-number: QTBUG-7540 Reviewed-by: Morten Sorvig
| | * | | | | | QtScript: Add missing API shim for signal handlingKent Hansen2010-03-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The signal handling bypasses the public QScriptValue API (it calls JSC::call() directly), hence we need to insert a shim to make sure that the correct identifier table will be used.
| | * | | | | | Designer: Fix broken resource view filtering.Friedemann Kleint2010-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Another side effect of 62c72ed2fd4aa6f5e62a190abf2dde2ba0f5ff0b . Task-number: QTBUG-9262 Initial-patch-by: Jarek Kobus <jkobus@trolltech.com>
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-268-38/+95
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Don't specify a BottomToTop scan line direction for YUV frames. Support expanding aspect ratio in direct show video window control. Support the Expanding aspect ratio mode in the gstreamer window control.
| | * | | | | | | Don't specify a BottomToTop scan line direction for YUV frames.Andrew den Exter2010-03-261-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A positive image height is supposed to indicate BottomToTop scan line direction, but this would seem to be true for RGB formats. Reviewed-by: Dmytro Poplavskiy
| | * | | | | | | Support expanding aspect ratio in direct show video window control.Andrew den Exter2010-03-264-30/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9118 Reviewed-by: Dmytro Poplavskiy
| | * | | | | | | Support the Expanding aspect ratio mode in the gstreamer window control.Andrew den Exter2010-03-263-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy Task-number: QTBUG-9118
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-263-7/+29
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: specify the configuration's purpose based on security mode of network.
| | * | | | | | | specify the configuration's purpose based on security mode of network.Lorn Potter2010-03-263-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | open is public.
* | | | | | | | | Fix change description: Import -> importMartin Jones2010-03-281-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Added highlight ranges/modes to PathViewMartin Jones2010-03-269-69/+297
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Task-number: QT-319
* | | | | | | Use QThread IdlePriority rather than linux platform code.Martin Jones2010-03-261-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9032
* | | | | | | Test and fix order of transform application.Warwick Allison2010-03-266-41/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Translate.z since Qt cannot sensibly support it yet.
* | | | | | | Test transforms.Warwick Allison2010-03-261-0/+21
| | | | | | |
* | | | | | | Fix namespace.Warwick Allison2010-03-261-1/+3
| | | | | | |
* | | | | | | Simple case, no size returned.Warwick Allison2010-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Particles plugin.
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-261-4/+0
|\ \ \ \ \ \ \