summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed incorrectly clipped video when rendered on QGLWidgetDmytro Poplavskiy2010-03-311-10/+14
| | | | | | | Don't enable GL stencil/scissor test inside of native GL rendering block if it was not enabled by QPaintEngine (QGLWidget viewport case). Reviewed-by: Andrew den Exter
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-30126-2089/+4438
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (22 commits) Fix typo in phonon/symbian. Fixed compilation on 64 bits Mac OS 10.5 Remove debug code disabling the video widget output control. Force a repaint on changes in the native size of video frames. Don't fill the video widget borders or background by default. Fix compile. QuickTime video widget: use widget palette for video background color. Update PulseAudio config.test. Fix strange typo? in Phonon/ds9.pro. Change availabilty of camera related code. QuickTime media backend: ensure quicktime notification are QuickTime backend: disable video outputs in stopped state. Remove references to evr based renderer from .pro. QuickTime media backend: Render CIImage based video frames directly with Phonon core; compile fixes after merge. Phonon qt7; Compile fixes after merge. Phonon; complete integration. Update Phonon CMakeLists.txt. Update Phonon qt7 backend to 4.4.0. Update Phonon ds9 backend to 4.4.0. ...
| * Fix typo in phonon/symbian.Justin McPherson2010-03-301-1/+1
| | | | | | | | Reviewed-by: Dmytro Poplavskiy
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-30126-2089/+4438
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (21 commits) Fixed compilation on 64 bits Mac OS 10.5 Remove debug code disabling the video widget output control. Force a repaint on changes in the native size of video frames. Don't fill the video widget borders or background by default. Fix compile. QuickTime video widget: use widget palette for video background color. Update PulseAudio config.test. Fix strange typo? in Phonon/ds9.pro. Change availabilty of camera related code. QuickTime media backend: ensure quicktime notification are QuickTime backend: disable video outputs in stopped state. Remove references to evr based renderer from .pro. QuickTime media backend: Render CIImage based video frames directly with Phonon core; compile fixes after merge. Phonon qt7; Compile fixes after merge. Phonon; complete integration. Update Phonon CMakeLists.txt. Update Phonon qt7 backend to 4.4.0. Update Phonon ds9 backend to 4.4.0. Update Phonon GStreamer backend to 4.4.0. ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-303-7/+34
| | |\
| | | * Remove debug code disabling the video widget output control.Andrew den Exter2010-03-301-1/+0
| | | | | | | | | | | | | | | | Reviewed-by: Derick Hawcroft
| | | * Force a repaint on changes in the native size of video frames.Andrew den Exter2010-03-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures old frame data is cleared when swithing to progressively smaller frame sizes. Reviewed-by: Derick Hawcroft
| | | * Don't fill the video widget borders or background by default.Andrew den Exter2010-03-303-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Can be enabled by settings setAutoFillBackground or the Qt::WA_OpaquePaintEvent to true. Reviewed-by: Dmytro Poplavskiy
| | * | Fixed compilation on 64 bits Mac OS 10.5Dmytro Poplavskiy2010-03-301-1/+1
| | |/ | | | | | | | | | Reviewed-by: Justin McPherson
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Andrew den Exter2010-03-295-20/+45
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-297-21/+54
| | | |\
| | | | * Update PulseAudio config.test.Justin McPherson2010-03-294-19/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally by Thiago Macieira Reviewed-by: Justin McPherson
| | | * | QuickTime video widget: use widget palette for video background color.Dmytro Poplavskiy2010-03-291-1/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Justin McPherson
| | * | | Fix compile.Andrew den Exter2010-03-291-0/+2
| | | |/ | | |/| | | | | | | | | | | | | | | | | Add videorenderer_vmr9.h/cpp back into ds9.pro Reviewed-by: Justin McPherson
| | * | Fix strange typo? in Phonon/ds9.pro.Justin McPherson2010-03-291-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Andrew den Exter
| | * | Change availabilty of camera related code.Justin McPherson2010-03-292-1/+10
| | |/ | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-29104-1964/+3675
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-2999-1959/+3665
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Remove references to evr based renderer from .pro. Phonon core; compile fixes after merge. Phonon qt7; Compile fixes after merge. Phonon; complete integration. Update Phonon CMakeLists.txt. Update Phonon qt7 backend to 4.4.0. Update Phonon ds9 backend to 4.4.0. Update Phonon GStreamer backend to 4.4.0. Update Phonon core to 4.4.0
| | | | * Merge branch 'phonon-update' into 4.7Justin McPherson2010-03-2999-1959/+3665
| | | | |\
| | | | | * Remove references to evr based renderer from .pro.Justin McPherson2010-03-291-10/+1
| | | | | |
| | | | | * Phonon core; compile fixes after merge.Justin McPherson2010-03-262-2/+1
| | | | | |
| | | | | * Phonon qt7; Compile fixes after merge.Justin McPherson2010-03-265-12/+21
| | | | | |
| | | | | * Phonon; complete integration.Justin McPherson2010-03-2512-22/+1678
| | | | | |
| | | | | * Update Phonon CMakeLists.txt.Justin McPherson2010-03-251-1/+1
| | | | | |
| | | | | * Update Phonon qt7 backend to 4.4.0.Justin McPherson2010-03-2510-574/+137
| | | | | |
| | | | | * Update Phonon ds9 backend to 4.4.0.Justin McPherson2010-03-2533-996/+621
| | | | | |
| | | | | * Update Phonon GStreamer backend to 4.4.0.Justin McPherson2010-03-2520-142/+651
| | | | | |
| | | | | * Update Phonon core to 4.4.0Justin McPherson2010-03-2523-217/+571
| | | | | |
| | * | | | QuickTime media backend: ensure quicktime notification areDmytro Poplavskiy2010-03-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | received in the player session thread. Reviewed-by: Justin McPherson
| | * | | | QuickTime backend: disable video outputs in stopped state.Dmytro Poplavskiy2010-03-2910-33/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To keep backend behaviour consistent with other platforms. Also dropped QT7VideoOutput::setEnabled(), currentry the video output is disabled with passing null movie, this allows to ensure the movie is not retained more than necessary. Reviewed-by: Justin McPherson
| | * | | | QuickTime media backend: Render CIImage based video frames directly withDmytro Poplavskiy2010-03-2911-66/+660
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenGL paint engine. This makes video rendering with QGraphicsVideoItem much faster on 64 bits systems. Reviewed-by: Justin McPherson
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-3058-849/+1139
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Correctly construct boolean JSValue's Update QmlChanges for SmoothedAnimation WorkerScript was receiving events after deletion and trying to process Make qmlpixmapcache thread shutdown cleaner Make visual tests run on windows Fixes PathView compile warnings Finished file rename of qdeclarative easefollow to smoothedanimation Change and rename qml EaseFollow to SmoothedAnimation Fix parenting after 6f88388db4e8e202780d789e66664ff824691948. Fix viewer resizing on reload and File->open Don't emit onPositionChanged before onPressed
| * | | | Correctly construct boolean JSValue'sAaron Kennedy2010-03-303-3/+47
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9205
| * | | | Update QmlChanges for SmoothedAnimationLeonardo Sobral Cunha2010-03-301-0/+33
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-3050-816/+1036
| |\ \ \ \
| | * | | | WorkerScript was receiving events after deletion and trying to processBea Lam2010-03-302-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | these events.
| | * | | | Make visual tests run on windowsMartin Jones2010-03-301-1/+2
| | | | | |
| | * | | | Fixes PathView compile warningsLeonardo Sobral Cunha2010-03-302-2/+2
| | | | | |
| | * | | | Finished file rename of qdeclarative easefollow to smoothedanimationLeonardo Sobral Cunha2010-03-3025-33/+32
| | | | | |
| | * | | | Change and rename qml EaseFollow to SmoothedAnimationLeonardo Sobral Cunha2010-03-3025-386/+609
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeSmoothedAnimation inherits from QDeclarativeNumberAnimation, as a consequence SmoothedAnimation can be used inside Behaviors and as PropertySourceValues, like any other animation. The old EaseFollow properties changed to comply with the other declarative animations ('source' changed to 'to'), so now 'to' changes are not automatically 'followed' anymore. You can achieve the following behavior by putting a SmoothedAnimation inside a Behavior of a property that is bound to another, as the following example: If you want to follow an hypothetical rect1, you should do now: Rectangle { color: "green" width: 60; height: 60; x: rect1.x - 5; y: rect1.y - 5; Behavior on x { SmoothedAnimation { velocity: 200 } } Behavior on y { SmoothedAnimation { velocity: 200 } } } SmoothedAnimation also supports animating multiple target(s)/property(ies) in the transition case. When a QDeclarativeSmoothedAnimation is restarted, it will match the QDeclarativeProperty which were being animated and transfer the corresponding track velocity to the new starting animations. QSmoothedAnimation is an uncontrolled animation, duration == -1. The duration is set as -1 to avoid consecutive animation state changes stop()/start(). This is particularly useful when using QSmoothAnimation to 'follow' another property, which is also being animated (change the 'to' property every tick). Reviewed-by: Michael Brasser
| | * | | | Fix parenting after 6f88388db4e8e202780d789e66664ff824691948.Michael Brasser2010-03-308-35/+31
| | | | | |
| * | | | | Make qmlpixmapcache thread shutdown cleanerMartin Jones2010-03-301-12/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change to Thiago's method: QThread::quit() is *not* thread-safe, so we mustn't call it from outside the QThread that the QThread holds. Unlike other QObjects, this method and some others must not be called from the thread they have affinity to. So add a hack to call it in the auxiliary thread. Do that by connecting a dummy QObject's destroyed() signal to the quit() slot in a DirectConnection, then move the object to the thread. When we call deleteLater(), this will cause the thread's event loop to delete the object, which in turn calls quit() in the actual thread. Reviewed-by: Thiago Macieira
| * | | | Fix viewer resizing on reload and File->openMartin Jones2010-03-302-17/+17
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9325
| * | | | Don't emit onPositionChanged before onPressedMartin Jones2010-03-301-1/+0
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9383
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-30935-2250/+5724
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (136 commits) Make QDeclarativeListProperty a class Fix qdeclarativedom::loadDynamicProperty test Correctly parent repeater items. Make sure cursor delegate is parented. Allow just one dimension to be set, the other scaled accordingly Simplify import path. Removed unneeded code. Update autotest a little Improve QML compiler statistics Use error enum not numbers Pass test. doc test error code too QDeclarativeItem::setParentItem should not modify the QObject parent Doc Ensure currentIndex is updated when PathView items are removed/moved Visual test fixes. Doc Relayout items when Flow size changes. Make sure the image reader thread is shutdown properly ...
| * | | Make QDeclarativeListProperty a classAaron Kennedy2010-03-302-2/+4
| | | | | | | | | | | | | | | | Apparently structs are not socially acceptable.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-3010-77/+65
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
| | * | | Correctly parent repeater items.Michael Brasser2010-03-301-5/+5
| | | | |
| | * | | Make sure cursor delegate is parented.Michael Brasser2010-03-292-0/+4
| | | | | | | | | | | | | | | | | | | | setParentItem no longer sets QObject parent.
| | * | | Allow just one dimension to be set, the other scaled accordinglyWarwick Allison2010-03-291-3/+11
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8984