summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-03-3119-115/+309
|\ \ \ \
| * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-03-30169-758/+32267
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc mkspecs/common/symbian/symbian.conf src/gui/graphicsview/qgraphicswidget.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| | * | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-3018-100/+299
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | Conflicts: src/3rdparty/phonon/ds9/iodevicereader.cpp
| | | * | Don't fill the video widget borders or background by default.Andrew den Exter2010-03-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can be enabled by settings setAutoFillBackground or the Qt::WA_OpaquePaintEvent to true. Reviewed-by: Dmytro Poplavskiy
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Andrew den Exter2010-03-291-1/+2
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-293-2/+11
| | | | |\ \
| | | | * | | 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-292-20/+13
| | | |\ \
| | | | * \ Merge branch 'phonon-update' into 4.7Justin McPherson2010-03-292-20/+13
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * Remove references to evr based renderer from .pro.Justin McPherson2010-03-291-10/+1
| | | | | |
| | | | | * Update Phonon GStreamer backend to 4.4.0.Justin McPherson2010-03-251-10/+12
| | | | | |
| | | * | | 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-296-42/+249
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenGL paint engine. This makes video rendering with QGraphicsVideoItem much faster on 64 bits systems. Reviewed-by: Justin McPherson
| * | | | Refactor QDirectFBPixmap::fromImage slightlyAnders Bakken2010-03-261-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the function a little and make sure I don't call QImage::hasAlphaChannel twice for opaque images. Reviewed-by: muthu <qt-info@nokia.com>
| * | | | QDirectFBPixmap can handle NoOpaqueDetection.Anders Bakken2010-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to do the conversion using QImage when NoOpaqueDetection is specified. Reviewed-by: muthu <qt-info@nokia.com>
* | | | | Total makeover of SVG image readeraavit2010-03-312-67/+106
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved/fixed canRead(). Added svgz support. Implemented ClipRect, ScaledClipRect and BackgroundColor support. Avoid data copy when reading from memory. Improved support reading from sequential devices. Added svg and svgz files to the qimagereader autotests. Task-number: QTBUG-8227 and QTBUG-9053 Reviewed-by: Kim
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-261-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix bad merge Fix wrong arguments order in a warning in QObject::moveToThread Fix warnings and build on mingw Fixes a deadlock with streaming in Phonon. cetest build fix cetest build fix for TCP sync connection Fixed QPrintPreview text drawing (visible in Assistant). Fix glyph advance on Mac/Carbon itemChange() is now called when transformation properties change. stabilize tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint Fix QLabel::sizeHint() Fix QFontMetrics::height() and QFontMetrics autotest Add QFont::ForceIntegerMetrics style strategy flag Auto test for commit 4a4458d1cf5ec7885c6f63f739b7ee80c70ad211
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-261-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix bad merge Fix wrong arguments order in a warning in QObject::moveToThread Fix warnings and build on mingw Fixes a deadlock with streaming in Phonon. cetest build fix cetest build fix for TCP sync connection Fixed QPrintPreview text drawing (visible in Assistant). Fix glyph advance on Mac/Carbon itemChange() is now called when transformation properties change. stabilize tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint Fix QLabel::sizeHint() Fix QFontMetrics::height() and QFontMetrics autotest Add QFont::ForceIntegerMetrics style strategy flag Auto test for commit 4a4458d1cf5ec7885c6f63f739b7ee80c70ad211
| | * \ \ Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-2523-547/+678
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/generator.cpp tools/qdoc3/node.cpp
| | * | | | Fix warnings and build on mingwThierry Bastian2010-03-251-2/+2
| | | |_|/ | | |/| |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-268-38/+95
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Don't specify a BottomToTop scan line direction for YUV frames. Support expanding aspect ratio in direct show video window control. Support the Expanding aspect ratio mode in the gstreamer window control.
| * | | | Don't specify a BottomToTop scan line direction for YUV frames.Andrew den Exter2010-03-261-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A positive image height is supposed to indicate BottomToTop scan line direction, but this would seem to be true for RGB formats. Reviewed-by: Dmytro Poplavskiy
| * | | | Support expanding aspect ratio in direct show video window control.Andrew den Exter2010-03-264-30/+43
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9118 Reviewed-by: Dmytro Poplavskiy
| * | | | Support the Expanding aspect ratio mode in the gstreamer window control.Andrew den Exter2010-03-263-2/+30
| |/ / / | | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy Task-number: QTBUG-9118
* | | | specify the configuration's purpose based on security mode of network.Lorn Potter2010-03-263-7/+29
| |/ / |/| | | | | | | | open is public.
* | | don't just return the first key here.Lorn Potter2010-03-251-3/+0
| | | | | | | | | | | | this fixes associating..
* | | Fix crash.Aaron McCarthy2010-03-251-1/+1
| | | | | | | | | | | | Resources are not allocated on error. Only free on success.
* | | Compile with QT_NO_NETWORKINTERFACE defined.Aaron McCarthy2010-03-2510-15/+33
| | |
* | | Don't emit signals in constructor.Aaron McCarthy2010-03-252-4/+11
| | |
* | | Remove unused code.Aaron McCarthy2010-03-252-212/+113
| | |