summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Fixed a QBuffer warning caused by a regression in qjpegJohn Brooks2010-05-031-3/+9
| | | | | | | | | | Commit c1431e6d introduced an invalid QBuffer seek that generates a warning when decoding JPEG from QBuffer. Also fixes the behavior of seeking after the image data, and the behavior when the device is not at position 0. Merge-request: 2378 Reviewed-by: aavit <qt-info@nokia.com>
* Fix crash in direct show media service with mingw and a video surface.Andrew den Exter2010-04-302-20/+8
| | | | | | | | | | | Mingw appears unable to resolve a valid pointer to the IMemInputPin interface from the DirectShowSampleScheduler class when it inherits from QWinEventNotifier. Inheriting from QObject does not have the same problem, so do that instead and connect to the activated signal of a separate instance of QWinEventNotifier. Task-number: 10221 Reviewed-by: Justin McPherson
* Gstreamer media backend: fixed embedded qt buildDmytro Poplavskiy2010-04-295-21/+62
| | | | | | | | XVideo is not available on framebuffer, so widget and window video outputs are disabled, only the renderer video output is supported. Reviewed-by: Justin McPherson
* S60 mediaservices backendhawcroft2010-04-2932-0/+4976
| | | | Reviewed-by: Justin McPherson
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-271-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix compilation with QT_NO_TEXTSTREAM Fix the compilation with QT_NO_TOOLTIP Add unit tests for a number of QList methods. Crash while dragging on Mac OS X (Cocoa) Doc & menubar hidden for QtDemo after switching back from fullscreen qdoc: Added breadcrumbs for class pages. QTabWidget documentMode not working correctly on Mac qdoc: Removed MacRefs for Xcode documentation stuff. Slight QList documentation fix.
| * Fix the compilation with QT_NO_TOOLTIPTasuku Suzuki2010-04-271-0/+4
| | | | | | | | | | Merge-request: 579 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | Fix attempted invocation of non-existent timerActivated() slot.Andrew den Exter2010-04-271-2/+2
|/ | | | | | | | The slot in question was changed to an event handler that emitted a signal. Invoke the signal instead. Task-number: QTBUG-10145 Reviewed-by: Justin McPherson
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-261-3/+11
|\ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Don't leak objects if QX11GLSharedContexts is instanciated twice Enable QX11GLWindowSurface using "-graphicssystem x11gl" option Force full-screen updates for QGLWindowSurface
| * Enable QX11GLWindowSurface using "-graphicssystem x11gl" optionTom Cooksey2010-04-261-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the OpenGL graphics system is in X11GL mode, it will use the QX11GLWindowSurface for all widgets except QGraphicsViews with the FullViewportUpdate update mode set, where it will use the regular QGLWindowSurface, as this is probabbly faster. QX11GLWindowSurface differs from QGLWindowSurface because it allows accelerated scrolling and partial updates, while still being using opengl to do rendering. Task-number: QT-280 Task-number: QT-2625 Reviewed-By: Trond
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-2441-232/+289
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (27 commits) Remove trace code from directshowaudioendpointcontrol.h. New configure.exe binary Add support for MSBuild, which is the project format for MSVC 2010 Only add qvideowidget test once. Multimedia causes build failure when Qt is configured with -embedded Player demo: load not only local files but playlists and urls passed as Gstreamer media backend: preserve playback rate after seeks and media QT7 mediaservice; fix leaking strings. Fixed Qt build with mediaservices disabled. Multimedia tests; fix for missing dependency Disabled QMediaPlayer states debug output. Fixed typo in QMediaPlayer::play() error reporting Fixed QVideoWidget test, waiting for video surface painted. Tests; Fix media tests, make sure they are using mediaservies. Fix warning about illegal empty declaration. Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. ...
| * Remove trace code from directshowaudioendpointcontrol.h.Andrew den Exter2010-04-231-5/+0
| | | | | | | | | | | | Quack. Reviewed-by: Justin McPherson
| * Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-2212-332/+421
| |\ | | | | | | | | | | | | Conflicts: demos/multimedia/player/player.pro
| * | Gstreamer media backend: preserve playback rate after seeks and mediaDmytro Poplavskiy2010-04-211-4/+15
| | | | | | | | | | | | | | | | | | changes. Reviewed-by: Andrew den Exter
| * | QT7 mediaservice; fix leaking strings.Justin McPherson2010-04-201-8/+7
| | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-1941-215/+267
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Disabled QMediaPlayer states debug output. Fixed typo in QMediaPlayer::play() error reporting Fixed QVideoWidget test, waiting for video surface painted. Tests; Fix media tests, make sure they are using mediaservies. Fix warning about illegal empty declaration. Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. QtMediaservices -> QtMediaServices. configure; Fixes for changes to use mediaservices. Fixed compile errors in pulseaudio backend for soundeffect Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d Fixed compile errors with gstreamer plugin Create Mediaservices lib, separate from Multimedia. Gstreamer media backend: seek to media start on end of stream.
| | * | Fix compile errors in Direct Show media service.Andrew den Exter2010-04-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The service links against the multimedia library in addition to the mediaservices libarary, and QAbstractVideoSurface is defined in QtMultimedia, no QtMediaServices.
| | * | QtMediaservices -> QtMediaServices.Justin McPherson2010-04-1637-185/+185
| | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | * | Fixed compile errors with gstreamer pluginKurt Korbatits2010-04-153-3/+3
| | | | | | | | | | | | | | | | Reviewed-by:Justin McPherson
| | * | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-1540-191/+191
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-142-24/+76
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Gstreamer media backend: seek to media start on end of stream.
| | | * | Gstreamer media backend: seek to media start on end of stream.Dmytro Poplavskiy2010-04-142-24/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To ensure the sequential play() calls work without setMedia(). Since in many case new media is assigned to playback after EOS, seeking is delayed and performed just before playing the same media. Task-number: QTBUG-9798 Reviewed-by: Andrew den Exter
* | | | | Optimization: Avoid data copy when reading jpegs from memoryaavit2010-04-231-3/+10
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | If the iodevice is actually a qbuffer, avoid read() and just give libjpeg a pointer to the contained data directly. Related to QTBUG-9095. Reviewed-by: Kim
* | | | fix memory bugLorn Potter2010-04-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | fixes using MallocScribble crash Task-number: QTBUG-10068
* | | | Remove redundant network configuration updates on startup.Aaron McCarthy2010-04-2012-16/+33
| | | | | | | | | | | | | | | | | | | | The initial list of network configurations was being fetched twice when the bearer management plugins are loaded.
* | | | make sure to lock theseLorn Potter2010-04-191-0/+6
| | | |
* | | | move network scan to thread.Lorn Potter2010-04-192-320/+388
|/ / / | | | | | | | | | | | | | | | increases startup time. Task-number: QTBUG-9722
* | | Compile (with -no-pch)Morten Johan Sørvig2010-04-151-1/+1
| | | | | | | | | qcorewlanengine.mm includes qt_cocoa_helpers_mac_p.h which is in QtGui.
* | | Add missing QT_NO_BEARERMANAGEMENT ifdefs.Aaron McCarthy2010-04-1516-3/+61
| | | | | | | | | | | | This add addition ifdefs around code missed by MR 517.
* | | Introduce a qconfig feature for Bearer ManagementTasuku Suzuki2010-04-156-0/+23
| | | | | | | | | | | | | | | Merge-request: 517 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* | | Remove holes in bearer management data structures.Aaron McCarthy2010-04-153-12/+12
| | |
* | | Don't link bearer plugins against QtGui unnecessarily.Aaron McCarthy2010-04-145-5/+5
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1416-926/+1276
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits) Added missing newline after warning message when using -L with qml Doc: updating scripts Fixed a crash on embedded due to uninitialized pointer. Fix a race where QThread::exit() is "lost" when called after start() qdoc: Removed all <table> attributes in favor of using css. Autotest failure: dialogModality test fails on cocoa (macgui) Force the bic test to compile in 32-bit mode on Mac Revert "Doc: Updating design files." Remove statically allocated pixmaps through the post routine qdoc: Checked for empty title. qdoc: Added TOC to class ref pages. Cocoa: qwidget autotest fails on setToolTip Compile on Mac OS 10.4 Bearer management changes from Qt Mobility (7a5ff985) Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors" Fix margins for placeholdertext in QLineEdit qdoc: Added TOC to module pages. Doc: Updating design files. Doc: Fixing design bugs. Updating the index page and script/style files. Adding some image files. qdoc: Changed <ul> elements in TOC. ...
| * | Compile on Mac OS 10.4Kent Hansen2010-04-146-3/+12
| | | | | | | | | | | | Reviewed-by: Morten Sørvig
| * | Bearer management changes from Qt Mobility (7a5ff985)Aaron McCarthy2010-04-1410-923/+1264
| |/ | | | | | | 7a5ff9859f5775915ae80c287f51c772599c2379
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-132-3/+10
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (53 commits) removed a few warnings on wince builds Removed double setting of _WIN32_WINNT QTreeView: remove dead code. doc: Clarify effect of QFont::NoFontMerging Revert "Implement heightForWidth support for QTabWidget and QStackedLayout." build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER Fix QT_NO_FILESYSTEMMODEL Build fix ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-122-3/+10
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (44 commits) QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER Fix QT_NO_FILESYSTEMMODEL Build fix Safeguard ourselves against corrupt registry values for cleartype gamma fix cetest build properly qdrawhelper: optimize the fetch transformed bilinear functions Compile fix for WinCE Make sure the selectionChanged signal is not called too much Implement heightForWidth support for QTabWidget and QStackedLayout. Fix the doc for QFrame::frameStyle Don't use texture-from-pixmap if the target isn't GL_TEXTURE_2D Add runtime check for GLX >= 1.3 before using glXCreatePixmap ...
| | * Get stride from LinuxFB instead of calculating it ourselves.Paul Olav Tvete2010-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | Fix comes from the bug report. Task-number: QTBUG-9532 Reviewed-by: Tom
| | * Revert "Remove references to evr based renderer from .pro."Thierry Bastian2010-04-071-4/+9
| | | | | | | | | | | | | | | This reverts commit 04d3b7ada83042c587a9ba199395b639c5f83623. Why would anyone want to remove evr renderer...
| | * Revert "Update Phonon ds9 backend to 4.4.0."Thierry Bastian2010-04-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 19a3fc3bd817628070e5637caf158b0be79eee82. The phonon backend in 4.4.0 is outdated. Qt has the most recent one. Conflicts: src/3rdparty/phonon/ds9/iodevicereader.cpp
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1310-2/+36
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits) Revert Merge Request 551. This introduces regressions to Qt. Fixed scroll area size calculation on Mac. Fix a race where QThread::exit() is "lost" when called after start() make a partial build of linguist in no-gui config make the code less of a trap fix build from top level Partially revert MR 543 changes to Linguist. Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too. Autotest: add some debugging, just in case there's something wrong Autotest: fix the fix for the rounding error. Fix compile error with QT_NO_LIBRARY in QtMultimedia the _setmode() prototype is different on win ce qdoc: Changed qdoc to output the new doc format. Doc: update 'developing on mac' fcntl.h doesn't seem to exist, either - contrary to an example on msdn Autotest: fix paths on the test server after update. Force the repaint during a window resize. fix compile on wince remove CONFIG += ordered again Assistant: Check namespace and virtual folder syntax of help projects. ...
| * | Introduce a qconfig feature for QtDBusTasuku Suzuki2010-04-089-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtDBus module is useless with QT_NO_PROPERTIES. Add D-Bus section and DBUS feature which requires PROPERTIES. Update qfeatures.h. Disable QtDBus module, a bearer management plugin for NetworkManager and a script plugin for QtDBus when QT_NO_DBUS is defined. Merge-request: 511 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | Allow building Qt without the QtGui moduleBernhard Rosenkraenzer2010-04-071-2/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a -no-gui switch to configure, allowing to build Qt without QtGui and components depending on QtGui. This is useful on headless servers, and in using QtCore, QtNetwork, QtXml, QtSql etc. on platforms QtGui hasn't been ported to yet. Task-number: QTBUG-4007 Merge-request: 543 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-121-1/+2
|\ \ | |/ |/| | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/gui/image/qimage.cpp src/openvg/qwindowsurface_vgegl.cpp
| * Fix problem with accessibility clients not getting info from QFileDialogAndy Shaw2010-04-111-1/+2
| | | | | | | | | | | | | | | | This fixes a problem with accessibility and QFileDialog, in addition the fix to complexwidgets.cpp will also fix any itemview that uses a root index. Reviewed-by: Jan-Arve
* | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-04-012-0/+8
|\ \ | | | | | | | | | | | | Conflicts: src/gui/text/qstatictext.cpp
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-302-0/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits) Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct. qdoc: Added <div> elements to some html output for class references. Fix compile error on mingw. MONILITY-645 Do not override alternate background color in Plastique Fix QComboBox ignoring foreground role in some styles Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined Fix compilation with Sun CC: Ensure that we return QPair<long,long> in all cases. Update PLATFORM(SPARC64) to CPU(SPARC64) jui files are no c++ ... scan some more file types by default Support EtchDisabledText with spin box on Windows style QNAM HTTP: Fix invoking a method when being destructed right now Fixed a typo in the QDoubleValidotor doc. Trivial fix to JavaScriptCore to fix building with MSVC 2010 Autotest: oops, fix oops: remove qguard from auto.pro Autotests: oops, remove last traces of QGuard Remove QGuard. Unskip test that used to crash ...
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-302-0/+8
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (24 commits) qdoc: Added <div> elements to some html output for class references. Fix compile error on mingw. MONILITY-645 Do not override alternate background color in Plastique Fix QComboBox ignoring foreground role in some styles Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined Fix compilation with Sun CC: Ensure that we return QPair<long,long> in all cases. Update PLATFORM(SPARC64) to CPU(SPARC64) jui files are no c++ ... scan some more file types by default Support EtchDisabledText with spin box on Windows style QNAM HTTP: Fix invoking a method when being destructed right now Fixed a typo in the QDoubleValidotor doc. Trivial fix to JavaScriptCore to fix building with MSVC 2010 Autotest: oops, fix oops: remove qguard from auto.pro Autotests: oops, remove last traces of QGuard Remove QGuard. Unskip test that used to crash QtScript: Add yet more missing API shims ...
| | | * | MONILITY-645Wolfgang Beck2010-03-302-0/+8
| | | | | | | | | | | | | | | | | | | | Merging bearer header.
| * | | | Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-3018-100/+299
| |\ \ \ \ | | |/ / /
| * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-291-15/+10
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
generated by cgit v0.12 at 2024-12-04 10:16:54 (GMT)