summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Compile fix for symbianaavit2010-02-201-5/+2
| | | | Reviewed-by: trust me
* Merge branch 'rtiff392'aavit2010-02-20170-62706/+9373
|\ | | | | | | | | Conflicts: doc/src/legal/3rdparty.qdoc
| * license doc updated for libtiff 3.9.2aavit2010-02-161-39/+78
| |
| * Our configuration and build modifications to libtiffaavit2010-02-166-1/+454
| |
| * Add libtiff 3.9.2aavit2010-02-16209-0/+68942
| | | | | | | | | | | | This is a clean copy of libtiff 3.9.2, except that contrib, tools, config and other unneeded stuff have been removed, as usual. Our configuration build modifications will follow in a separate commit.
| * Delete libtiff 3.8.2aavit2010-02-11243-122767/+0
| |
* | Merge branch 'rjpeg8'aavit2010-02-20133-5520/+24856
|\ \
| * | Update license doc, .pro file and qjpeghandler for libjpeg 8aavit2010-02-163-12/+23
| | | | | | | | | | | | | | | In libjpeg versions >= 7, the default unit-scaling when decompressing is given as 8/8 instead of 1/1.
| * | Our configuration and build modifications to libjpegaavit2010-02-162-2/+53
| | | | | | | | | | | | | | | This commit is the combination of earlier Qt patches to libpng, reapplied here after the upgrade to version 8.
| * | Add libjpeg 8aavit2010-02-16137-0/+53170
| | | | | | | | | | | | | | | | | | This is a clean copy of libjpeg , except that some build scripts, test images etc. have been removed, as usual. Our configuration modifications will follow in a separate commit.
| * | Delete libjpeg 6baavit2010-02-1690-33896/+0
| | |
* | | Fixed QGraphicsScene autotest failure in task250680_childClip.Samuel Rødal2010-02-193-83/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The path comparison is too strict. Even though the paths are equivalent (represent the same area) the comparison fails as they don't have the same representation. If we simplify the clip path and use the more generic path comparison approach from the QPathClipper autotest the test passes. Reviewed-by: Olivier Goffart
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-19875-1965/+61965
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-19209-10339/+47199
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (126 commits) Skip OpenGL threading tests on Mac as they were causing reboots Fixed compile of autotests. Fix warnings on gcc Add experimental VBO support for drawCachedGlyphs()'s index array Fix threaded gl autotest build failure on GLES2 Removed redundant debug output from trace benchmark. Added two QML based traces to trace benchmark. Fixed old trace files no longer working. Reduced the memory footprint of qttrace files. Added trace replayer benchmark. Added --range and --single arguments to qttracereplay. Always accept values reported directly using QTest::setBenchmarkResult. Make threading use-cases work for X11 Run firstRun initialization in declarative/painting benchmark Optimization for text drawing on OpenGL Enable QStaticText in QtDeclarative painting benchmark Fix no-webkit compiler helpviewer Make sure height of glyph cache is a power of two Fixes crash when destroying a QGraphicsItem. Move benchmarks/qvector to benchmarks/corelib/tools/qvector ...
| | * | | Skip OpenGL threading tests on Mac as they were causing rebootsTom Cooksey2010-02-191-0/+12
| | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-19209-10339/+47187
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (125 commits) Fixed compile of autotests. Fix warnings on gcc Add experimental VBO support for drawCachedGlyphs()'s index array Fix threaded gl autotest build failure on GLES2 Removed redundant debug output from trace benchmark. Added two QML based traces to trace benchmark. Fixed old trace files no longer working. Reduced the memory footprint of qttrace files. Added trace replayer benchmark. Added --range and --single arguments to qttracereplay. Always accept values reported directly using QTest::setBenchmarkResult. Make threading use-cases work for X11 Run firstRun initialization in declarative/painting benchmark Optimization for text drawing on OpenGL Enable QStaticText in QtDeclarative painting benchmark Fix no-webkit compiler helpviewer Make sure height of glyph cache is a power of two Fixes crash when destroying a QGraphicsItem. Move benchmarks/qvector to benchmarks/corelib/tools/qvector Some threading improvements to the GL module ...
| | | * | | Fixed compile of autotests.Rohan McGovern2010-02-182-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename tst_openglthreading.pro to qgl_threads.pro: .pro file name must match directory name for SUBDIRS project to work.
| | | * | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-18644-1954/+13821
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/tools/assistant/helpviewer_qtb.h tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h
| * | | \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-02-19228-4/+48126
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: (101 commits) QT5; Add back volume notification. Use old notification name for OSX < 10.6. QT7; make compile on 10.5. Lowercase Q to uppercase in QML elment URI. Complete namespace move; QtMedia -> QtMultimedia QuickTime playback backend: listen for natural size changes and update Use the qmlmodule method for adding multimedia qml elements. Revert "Added multimedia to qmlviewer" Change namespace; QtMedia -> QtMultimedia Quicktime playback backend: Recreate the visual context on video native QuickTime playback backend: Listen for movie load state changes. Switch RGB24 and BGR24 shaders back. Disable the full screen video widget tests on X11. Use the IPropertyBag interface to get audio device names. Fix qmlgraphicsvideo.pro Add qmlgraphicsvideo test to auto.pro Fix QMediaServiceProvider test. Make QMediaPlaylist test pass. Fix QMediaPlayer test failure. Fix qmlaudio.pro. ...
| | * | | | | QT5; Add back volume notification.Justin McPherson2010-02-191-11/+20
| | | | | | |
| | * | | | | Use old notification name for OSX < 10.6.Justin McPherson2010-02-191-7/+9
| | | | | | |
| | * | | | | QT7; make compile on 10.5.Justin McPherson2010-02-191-1/+2
| | | | | | |
| | * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-teamJustin McPherson2010-02-1911-59/+197
| | |\ \ \ \ \
| | | * | | | | QuickTime playback backend: listen for natural size changes and updateDmytro Poplavskiy2010-02-1911-15/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | video outputs.
| | | * | | | | Quicktime playback backend: Recreate the visual context on video nativeDmytro Poplavskiy2010-02-191-30/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size changes.
| | | * | | | | QuickTime playback backend: Listen for movie load state changes.Dmytro Poplavskiy2010-02-192-28/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To start playback and notify video output when movie reached playable state.
| | * | | | | | Lowercase Q to uppercase in QML elment URI.Justin McPherson2010-02-191-5/+5
| | | | | | | |
| | * | | | | | Complete namespace move; QtMedia -> QtMultimediaJustin McPherson2010-02-1911-164/+164
| | | | | | | |
| | * | | | | | Use the qmlmodule method for adding multimedia qml elements.Justin McPherson2010-02-1910-7/+95
| | | | | | | |
| | * | | | | | Revert "Added multimedia to qmlviewer"Justin McPherson2010-02-191-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 78967c9f7cfba6142a5f987a1fe81692b479a6d2.
| | * | | | | | Change namespace; QtMedia -> QtMultimediaJustin McPherson2010-02-1918-201/+201
| | |/ / / / /
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-02-18226-4/+47892
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: (90 commits) Switch RGB24 and BGR24 shaders back. Disable the full screen video widget tests on X11. Use the IPropertyBag interface to get audio device names. Fix qmlgraphicsvideo.pro Add qmlgraphicsvideo test to auto.pro Fix QMediaServiceProvider test. Make QMediaPlaylist test pass. Fix QMediaPlayer test failure. Fix qmlaudio.pro. Make QMediaPlayer test compile. Remove tests not relevant to playback functionality. Remove tests that depend on playlist plugins. Support YUV444 formats in QPainterVideoSurface. Add qmlaudio test to auto.pro Fix license headers. Remove unused files. Extend the mappings between Direct Show and QVideoFrame color formats. Don't paint RGB24 frames as BGR24. Added multimedia to qmlviewer Fixed compile error in pulseaudio soundeffect implementation ...
| | | * | | | Switch RGB24 and BGR24 shaders back.Andrew den Exter2010-02-183-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts a7f6af9817771b8211433c8cf24fe7150c5b7bf5. The original relationship was consistent with QImage's RGB24, making the direct show RGB24 format BGR24.
| | | * | | | Disable the full screen video widget tests on X11.Andrew den Exter2010-02-181-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Too susceptible to timing problems.
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-02-18226-4/+47887
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: (88 commits) Use the IPropertyBag interface to get audio device names. Fix qmlgraphicsvideo.pro Add qmlgraphicsvideo test to auto.pro Fix QMediaServiceProvider test. Make QMediaPlaylist test pass. Fix QMediaPlayer test failure. Fix qmlaudio.pro. Make QMediaPlayer test compile. Remove tests not relevant to playback functionality. Remove tests that depend on playlist plugins. Support YUV444 formats in QPainterVideoSurface. Add qmlaudio test to auto.pro Fix license headers. Remove unused files. Extend the mappings between Direct Show and QVideoFrame color formats. Don't paint RGB24 frames as BGR24. Added multimedia to qmlviewer Fixed compile error in pulseaudio soundeffect implementation Always pass encoded URLs to GStreamer. Fixes issue with spaces in Exclude OpenGL from QGraphicsVideoItem if Qt doesn't include QtOpenGL. ...
| | | | * | | | Use the IPropertyBag interface to get audio device names.Andrew den Exter2010-02-181-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is instead of parsing the identifier, which is guaranteed to have a readable name in it.
| | | | * | | | Fix qmlgraphicsvideo.proJustin McPherson2010-02-171-1/+1
| | | | | | | |
| | | | * | | | Add qmlgraphicsvideo test to auto.proJustin McPherson2010-02-171-0/+1
| | | | | | | |
| | | | * | | | Fix QMediaServiceProvider test.Justin McPherson2010-02-171-2/+3
| | | | | | | |
| | | | * | | | Make QMediaPlaylist test pass.Andrew den Exter2010-02-172-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test was failing because an ignored warning wasn't being output. Remove both the warning and ignore statements.
| | | | * | | | Fix QMediaPlayer test failure.Andrew den Exter2010-02-176-40/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepending the Qt namespace with QT_PREPEND_NAMESPACE in a Q_DECLARE_METATYPE statement is unecessary and appears not to work with signal declarations in QSignalSpy.
| | | | * | | | Fix qmlaudio.pro.Justin McPherson2010-02-171-1/+1
| | | | | | | |
| | | | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-teamJustin McPherson2010-02-173-3/+78
| | | | |\ \ \ \
| | | | | * | | | Make QMediaPlayer test compile.Andrew den Exter2010-02-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test changes weren't ported with the rest of the changes for isAudioAvailable().
| | | | | * | | | Support YUV444 formats in QPainterVideoSurface.Andrew den Exter2010-02-172-3/+76
| | | | | | | | |
| | | | * | | | | Remove tests not relevant to playback functionality.Justin McPherson2010-02-171-52/+2
| | | | | | | | |
| | | | * | | | | Remove tests that depend on playlist plugins.Justin McPherson2010-02-171-28/+0
| | | | | | | | |
| | | | * | | | | Add qmlaudio test to auto.proJustin McPherson2010-02-171-0/+1
| | | | | | | | |
| | | | * | | | | Fix license headers.Justin McPherson2010-02-1713-26/+26
| | | | | | | | |
| | | | * | | | | Remove unused files.Justin McPherson2010-02-176-419/+0
| | | | |/ / / /