summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rtiff392'aavit2010-02-20169-62667/+9295
|\ | | | | | | | | Conflicts: doc/src/legal/3rdparty.qdoc
| * 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-20132-5513/+24843
|\ \
| * | Update license doc, .pro file and qjpeghandler for libjpeg 8aavit2010-02-162-5/+10
| | | | | | | | | | | | | | | 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
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-19530-563/+38789
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-19178-10290/+45712
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| | * \ \ Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-18344-559/+956
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/tools/assistant/helpviewer_qtb.h tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h
| * | | | | 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-197-117/+117
| | | | | | |
| * | | | | | Use the qmlmodule method for adding multimedia qml elements.Justin McPherson2010-02-1910-7/+95
| | | | | | |
| * | | | | | Change namespace; QtMedia -> QtMultimediaJustin McPherson2010-02-1917-197/+197
| |/ / / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-02-18183-4/+37595
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-02-18183-4/+37595
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * | | | Make QMediaPlaylist test pass.Andrew den Exter2010-02-171-1/+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-175-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-teamJustin McPherson2010-02-172-3/+76
| | | |\ \ \ \
| | | | * | | | Support YUV444 formats in QPainterVideoSurface.Andrew den Exter2010-02-172-3/+76
| | | | | | | |
| | | * | | | | Fix license headers.Justin McPherson2010-02-172-4/+4
| | | | | | | |
| | | * | | | | Remove unused files.Justin McPherson2010-02-176-419/+0
| | | |/ / / /
| | | * | | | Extend the mappings between Direct Show and QVideoFrame color formats.Andrew den Exter2010-02-161-4/+31
| | | | | | |
| | | * | | | Don't paint RGB24 frames as BGR24.Andrew den Exter2010-02-162-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A non-swizzling shader was being used for RGB24. This looked correct on linux because the gstreamer backend was misidentifying BGR24 as RGB24. And since BGR is supported include it in the list of supported formats.
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-teamNicholas Young2010-02-163-3/+8
| | | |\ \ \ \
| | | | * | | | Fixed compile error in pulseaudio soundeffect implementationKurt Korbatits2010-02-162-3/+3
| | | | | | | |
| | | | * | | | Exclude OpenGL from QGraphicsVideoItem if Qt doesn't include QtOpenGL.Andrew den Exter2010-02-161-0/+5
| | | | | | | |
| | | * | | | | Always pass encoded URLs to GStreamer. Fixes issue with spaces inNicholas Young2010-02-161-1/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | filenames.
| | | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimediaJustin McPherson2010-02-152-15/+17
| | | |\ \ \ \
| | | | * | | | Fix flickering when items are overlaid on QGraphicsVideoItem.Andrew den Exter2010-02-152-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable scissor and stencil tests so the texture frame is clipped correctly. Otherwise when an overlaid item is updated the entire frame will be redrawn not just the part intersecting the updated item, resulting in other items being drawn over.
| | | | * | | | Extend hue rotation to a full 360 degrees.Andrew den Exter2010-02-151-1/+1
| | | | | | | |
| | | | * | | | Fix hue rotation in QPainterVideoSurface.Andrew den Exter2010-02-151-9/+9
| | | | | | | |
| | | * | | | | Express dependencies for QtMultimedia.Justin McPherson2010-02-151-2/+3
| | | | | | | |
| | | * | | | | Add missing QT_MODULE to header.Justin McPherson2010-02-151-0/+2
| | | | | | | |
| | | * | | | | Cleanup include files.Justin McPherson2010-02-155-17/+50
| | | | | | | |
| | | * | | | | Use correct license headers.Justin McPherson2010-02-1510-20/+20
| | | | | | | |
| | | * | | | | Use correct path for private header.Justin McPherson2010-02-151-1/+1
| | | | | | | |
| | | * | | | | Use correct path for headers and source in qml.pri.Justin McPherson2010-02-151-6/+6
| | | | | | | |
| | | * | | | | Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-14489-1809/+109403
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
generated by cgit v0.12 at 2024-10-05 13:15:47 (GMT)