summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-245-10/+6
|\ | | | | | | | | Conflicts: src/declarative/qml/qml.h
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-245-10/+6
| |\ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc src/declarative/qml/qmlmoduleplugin.cpp src/declarative/util/qmlxmllistmodel.cpp
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-225-10/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (30 commits) Second attempt at work-around for MSVC2008 compiler crash QNativeSocketEngine: Fix some error handling related to waitFor*() qdoc: List new QML elements in \sincelist for What's New page. Cocoa: fix namespace build Cocoa: Fix build with namespace Cocoa: namespace build fix doc: Fixed some qdoc errors. Don't include private headers from public headers. Fix compilation on HP-UXi: m_volume is a #define WinCE doesn't have sys/types.h Fix compilation: qmlviewer cannot use symbols exported with Q_AUTOTEST_EXPORT in production builds Fix compilation on recent Linux systems: getpid(2) is in unistd.h. Cocoa: calling QEventLoop::exec from mouse up causes problem Fix compilation on GNU/Hurd (SA_SIGINFO isn't defined) Doc: Collected the Declarative UI tutorials together and renamed them. Doc: Simplified Commercial Editions for Qt 4.7. Work around MSVC2008 compiler crash doc: Added "\since 4.7" to a bunch of declarative stuff. Cocoa: event dispatcher eats mouse events Fix an issue about double-click on Mac OS X. ...
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-225-10/+6
| | | |\
| | | | * Cocoa: fix namespace buildRichard Moe Gustavsen2010-02-225-10/+6
| | | | | | | | | | | | | | | | | | | | added/removed namespace macros as needed
| | | * | qdoc: List new QML elements in \sincelist for What's New page.Martin Smith2010-02-221-1/+1
| | | |/
| | | * doc: Fixed some qdoc errors.Martin Smith2010-02-221-1/+1
| | | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-232-17/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: src/declarative/util/qmlanimation.cpp src/declarative/util/qmlxmllistmodel.cpp
| * | | Get rid of QmlModulePlugin.Roberto Raggi2010-02-231-12/+4
| |/ /
* | | Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls.Warwick Allison2010-02-237-0/+755
|/ / | | | | | | Task-number: QT-2798
* | Documentation fixes.Justin McPherson2010-02-222-2/+2
| | | | | | | | Reviewed-by: Nicholas Young
* | Add a qRegisterQmlElements function to QtMultimediaJustin McPherson2010-02-221-6/+2
|/ | | | | | Avoid exposing private classes. Reviewed-by: Bill King
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-202-6/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile fix for symbian license doc updated for libtiff 3.9.2 Our configuration and build modifications to libtiff Add libtiff 3.9.2 Update license doc, .pro file and qjpeghandler for libjpeg 8 Our configuration and build modifications to libjpeg Add libjpeg 8 Delete libjpeg 6b Delete libtiff 3.8.2
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-02-202-0/+8
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-202-5/+10
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: license doc updated for libtiff 3.9.2 Our configuration and build modifications to libtiff Add libtiff 3.9.2 Update license doc, .pro file and qjpeghandler for libjpeg 8 Our configuration and build modifications to libjpeg Add libjpeg 8 Delete libjpeg 6b Delete libtiff 3.8.2
| * | | Compile fix for symbianaavit2010-02-201-5/+2
| | |/ | |/| | | | | | | Reviewed-by: trust me
| * | Merge branch 'rjpeg8'aavit2010-02-202-5/+10
| |\ \
| | * | 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.
* | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-20109-4/+18670
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-192-0/+8
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (81 commits) Revert "Speed up QmlGraphicsItem::setParentItem." Fix dynamic example More strict type checking of ListElement properties. Fix tst_QmlGraphicsLoader::networkRequestUrl autotest. Fix tst_qmlgraphicstextedit::delegateLoading autotest Delete the QmlImageRequestHandler in the correct thread. Fix "AnimatedImage ignores Anchors setting" Remove unused function that breaks build on AIX. doc Add support for startDragDistance in qmlviewer. Add pixmap benchmarks and make cached rounded rect the same as Rectangle. Make QmlDom API internal Compile fix with namepaces Doc: reformulate why we build a button Removed incorrect Q_UNUSED() macro from QmlPropertyAnimation::transition Doc: onExited, onEntered only work when button pressed or hoverEnabled Ensure visibleIndex and currentIndex are updated on itemsMoved(). QmlView API review. See QmlChanges.txt for details. Fix example after introduction of RotationAnimation. Animation doc fix. ...
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-181-7/+4
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/linux-g++-x11egl/qplatformdefs.h src/declarative/qml/qmldom.h src/declarative/util/qmlview.cpp src/declarative/util/qmlview.h tools/qdoc3/cppcodemarker.cpp tools/qmldebugger/standalone/canvasframerate.cpp tools/qmldebugger/standalone/engine.cpp tools/qmldebugger/standalone/expressionquerywidget.cpp tools/qmldebugger/standalone/expressionquerywidget.h tools/qmldebugger/standalone/objectpropertiesview.cpp tools/qmldebugger/standalone/objectpropertiesview.h tools/qmldebugger/standalone/objecttree.cpp tools/qmldebugger/standalone/qmldebugger.cpp tools/qmldebugger/standalone/watchtable.cpp tools/qmldebugger/standalone/watchtable.h
| | * | | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-162-0/+8
| | | | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-193-3/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-181-7/+4
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/tools/assistant/helpviewer_qtb.h tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h
| | * | | | Reduced the memory footprint of qttrace files.Samuel Rødal2010-02-181-2/+7
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of improvements have been made: * Use single precision floats for the traces. * Reduce the number of variant wrapped transforms by introducing a new translate command. * Reduce the number of bytes streamed per image / pixmap draw command. * Add versioning info to qttrace files to be more future proof. Reviewed-by: Gunnar Sletta
| | * | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-151-0/+11
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp
| | * | | Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7Eskil Abrahamsen Blomfeldt2010-02-155-513/+79
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qlineedit/tst_qlineedit.cpp Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7 Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qlineedit/tst_qlineedit.cpp Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7 Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tests/auto/qlineedit/tst_qlineedit.cpp
| | * \ \ \ Merge branch '4.6' into qstatictext-4.6Eskil Abrahamsen Blomfeldt2010-02-083-36/+85
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Eskil Abrahamsen Blomfeldt2010-02-045-2/+263
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | qstatictext-4.6
| | * | | | | | Lock before calling drawStaticTextItemAnders Bakken2010-02-022-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | | | | | | 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-193-41/+41
| | | | | | | | |
| * | | | | | | | Use the qmlmodule method for adding multimedia qml elements.Justin McPherson2010-02-194-0/+92
| | | | | | | | |
| * | | | | | | | Change namespace; QtMedia -> QtMultimediaJustin McPherson2010-02-197-95/+95
| |/ / / / / / /
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-02-18101-1/+18402
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-182-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts a7f6af9817771b8211433c8cf24fe7150c5b7bf5. The original relationship was consistent with QImage's RGB24, making the direct show RGB24 format BGR24.
| | * | | | | | 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.
| | * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-teamJustin McPherson2010-02-171-1/+2
| | |\ \ \ \ \ \
| | | * | | | | | Support YUV444 formats in QPainterVideoSurface.Andrew den Exter2010-02-171-1/+2
| | | | | | | | |
| | * | | | | | | 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-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | | Always pass encoded URLs to GStreamer. Fixes issue with spaces inNicholas Young2010-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filenames.
generated by cgit v0.12 at 2024-11-29 14:06:23 (GMT)