summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ | |/ /
| * | 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
* | | 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
| * | 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>
* | | 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
| | |
* | | fix multiple promps for keychain access when connecting to wifi networkLorn Potter2010-03-252-39/+111
| | | | | | | | | | | | Task-number: QT-3150
* | | not all interfaces should be activeLorn Potter2010-03-251-2/+2
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-2414-243/+391
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/plugins/bearer/corewlan/qcorewlanengine.mm
| * | | Optimization in QJpegHandler to reduce overheadZeno Albisser2010-03-242-188/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Image size and format is only calculated once on first call of readJpegHeader. Further private data has been extracted into QJpegHandlerPrivate. Unfotunately this change only has very little effect. Reviewed-by: aavit Task-number: QTBUG-9091
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-2414-91/+196
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (119 commits) Bearer management documentation. Bearer management changes from Qt Mobility (6fb31d1e). Remove extraneous semi-colon. Use the default codec with QString::vsprintf() Fix build with QT_NO_DOCKWIDGET Fix the test of QDirIterator with NoDot and NoDotDot Split QDir::NoDotAndDotDot into QDir::NoDot and QDir::NoDotDot QFSFileEngine: don't look through NTFS junctions After showing modal windows, WM_LBUTTONUP for double click is ignored. Possible fix for missing QML properties in the qt.qhp file. Use standard theme icons in Linguist where possible Use more standard icons from the theme in Assistant Use more standard icons for standard actions in Designer Drag & drop operations wont end while using Remote Desktop sessions _close(fd) closes the associated handle and not the other way around Fixed locale mapping on Symbian. Revert change 7bf4512659 on Cocoa. Extended the high_attributes array, since we have more than 127 widget attributes now. Added instructions for MinGW users wanting to build the MySQL driver. Designer: Fix broken resource view. ...
| | * | Bearer management changes from Qt Mobility (6fb31d1e).Aaron McCarthy2010-03-2410-53/+152
| | | | | | | | | | | | | | | | 6fb31d1e287d7def45c115eb56bcb9b0c5cb3c40.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-242-4/+29
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Added extra video buffer handle types. QuickTime MovieViewOutput: remove view from layout and reset source
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-2257-3024/+927
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-1522-263/+546
| | |\ \ \ \
| | * | | | | QuickTime MovieViewOutput: remove view from layout and reset sourceDmytro Poplavskiy2010-03-112-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | movie when MovieViewOutput output is disabled. Reviewed-by: Justin McPherson
* | | | | | | fix state reporting for certain wifi networks after associating.Lorn Potter2010-03-232-81/+88
| |_|_|_|/ / |/| | | | |
* | | | | | get rid of build warning messagesLorn Potter2010-03-231-6/+2
| | | | | |
* | | | | | Quiet unnecessary configure/qmake warnings when EPOCROOT is not set.Aaron McCarthy2010-03-232-25/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warnings are unnecessary when not building for Symbian. Task-number: QTBUG-9156
* | | | | | Add configure test for Maemo Internet Connection Daemon.Aaron McCarthy2010-03-232-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-9156
* | | | | | fix warningLorn Potter2010-03-231-1/+1
| | | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-222-2/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (78 commits) Moc: Add support for rvalue references in signals and slots. Add support for polyphonic greek Fix build failure on WinCE. Autotests: if you use X11 libs, you must link to X11 libs explicitly. Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x Compile Phonon in C++0x mode. Compile Qt in C++0x mode. Avoid a data relocation by not trying to store a pointer in the .data section of plugins. Fix cast-from-ascii warning Fix compilation on Linux Fix compilation with WINSCW: #include doesn't find files in the same dir Rename m_volume to m_vol Add 2 signals, introduce side widget, make it possible to reset startId Do not create native window handle just because a parent has one. Tab color fix for document mode on Snow Leopard. Revert "Don't emit open signal on session close/error." Rename networkAccess property to networkAccessible. Don't emit open signal on session close/error. Rename private signal. Autotest: fix instability by accepting rounding errors ...
| * | | | | Revert "Don't emit open signal on session close/error."Aaron McCarthy2010-03-192-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 39818f933b958d504b9cc18487658209d1df22da.
| * | | | | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-197-5/+19
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| * | | | | Don't emit open signal on session close/error.Aaron McCarthy2010-03-192-10/+11
| | | | | |