summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct.Thiago Macieira2010-03-301-3/+2
| | | | | Apparently the SDKs cannot agree on the contents of this struct, so let's memset the entire thing.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-3034-248/+202
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-3034-248/+202
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits) 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 QtScript: Make sure the old identifier table is restored ...
| | * Fix compile error on mingw.Jason McDonald2010-03-301-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Compile error seems to be going back and forth between mingw and wince compilers. Prefer correctness and portability over brevity by initializing each field of the struct one-by-one to guarantee portability between compilers. Reviewed-by: Lincoln Ramsay
| | * MONILITY-645Wolfgang Beck2010-03-305-18/+71
| | | | | | | | | | | | Merging bearer header.
| | * Do not override alternate background color in PlastiqueJens Bache-Wiig2010-03-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This palette tweak is no longer needed now that we set alternate row color on application startup. It also breaks on systems such as GNOME and KDE where you can configure this color. Reviewed-by: ogoffart Task-number: QTBUG-6516
| | * Fix QComboBox ignoring foreground role in some stylesJens Bache-Wiig2010-03-291-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically all styles using SH_Combobox_Popup would not previously respect the foreground role set. We need to set it for multiple color roles since styles sometimes interpret them differently. Reviewed-by: ogoffart Task-number: QTBUG-8796
| | * Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't definedThiago Macieira2010-03-291-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Ensure that we return QPair<long,long> in all cases.Thiago Macieira2010-03-291-3/+3
| | | | | | | | | | | | | | | | | | Fixes a compilation failure on AIX. Reviewed-By: Marius Storm-Olsen
| | * Update PLATFORM(SPARC64) to CPU(SPARC64)Thiago Macieira2010-03-291-1/+1
| | |
| | * Support EtchDisabledText with spin box on Windows styleJens Bache-Wiig2010-03-291-2/+6
| | | | | | | | | | | | | | | Reviewed-by: ogoffart Task-number: QTBUG-7525
| | * QNAM HTTP: Fix invoking a method when being destructed right nowPeter Hartmann2010-03-291-3/+6
| | | | | | | | | | | | Reviewed-by: Thiago Macieira
| | * Fixed a typo in the QDoubleValidotor doc.Denis Dzyubenko2010-03-291-1/+1
| | | | | | | | | | | | Reviewed-by: trustme
| | * Trivial fix to JavaScriptCore to fix building with MSVC 2010John Brooks2010-03-272-4/+4
| | | | | | | | | | | | Reviewed-By: Thiago Macieira
| | * Remove QGuard.Thiago Macieira2010-03-264-197/+1
| | | | | | | | | | | | | | | | | | | | | This class is no longer in use by QtDeclarative. Task-number: QT-3031 Reviewed-by: Bradley T. Hughes
| | * QtScript: Add yet more missing API shimsKent Hansen2010-03-264-4/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - for QScriptEngine and QScriptContext; we don't control what the JSC functions are doing, so it's better to have shims than not to have them (which can cause something to blow up), even if they might not be strictly necessary as of this writing. - for QScriptDeclarativeClass; otherwise the identifiers might be created/destroyed in the wrong engine. - for QScriptValueIterator destructor; otherwise the identifiers might be destroyed in the wrong engine. This is an attempt to fix a crash in Bauhaus, but it might still be crashing (i.e. still some shims missing, somewhere) ;(
| | * QtScript: Make sure the old identifier table is restoredKent Hansen2010-03-263-3/+6
| | | | | | | | | | | | Use a shim to take care of that.
| | * Fix compile error with QT_NO_TEXTHTMLPARSER in QtGuiTasuku Suzuki2010-03-261-1/+4
| | | | | | | | | | | | | | | Merge-request: 528 Reviewed-by: Zeno Albisser
| | * uic3: -extract: Write XPM-images correctly.Friedemann Kleint2010-03-268-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add magic header '/* XPM */' and turn off wrapping of lines that broke image readers. Add a command line option to activate line-wrapping in case someone exclusively wants to use the extracted images for embedding in code. Also do line-wrapping in case images are embedded into the ui-file. Note: The current versions of MSVC do not seem to have a limitation of line lengths any more. Task-number: QTBUG-9207 Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-30122-2071/+4391
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (22 commits) Fix typo in phonon/symbian. Fixed compilation on 64 bits Mac OS 10.5 Remove debug code disabling the video widget output control. Force a repaint on changes in the native size of video frames. Don't fill the video widget borders or background by default. Fix compile. QuickTime video widget: use widget palette for video background color. Update PulseAudio config.test. Fix strange typo? in Phonon/ds9.pro. Change availabilty of camera related code. QuickTime media backend: ensure quicktime notification are QuickTime backend: disable video outputs in stopped state. Remove references to evr based renderer from .pro. QuickTime media backend: Render CIImage based video frames directly with Phonon core; compile fixes after merge. Phonon qt7; Compile fixes after merge. Phonon; complete integration. Update Phonon CMakeLists.txt. Update Phonon qt7 backend to 4.4.0. Update Phonon ds9 backend to 4.4.0. ...
| * | | Fix typo in phonon/symbian.Justin McPherson2010-03-301-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-30122-2071/+4391
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (21 commits) Fixed compilation on 64 bits Mac OS 10.5 Remove debug code disabling the video widget output control. Force a repaint on changes in the native size of video frames. Don't fill the video widget borders or background by default. Fix compile. QuickTime video widget: use widget palette for video background color. Update PulseAudio config.test. Fix strange typo? in Phonon/ds9.pro. Change availabilty of camera related code. QuickTime media backend: ensure quicktime notification are QuickTime backend: disable video outputs in stopped state. Remove references to evr based renderer from .pro. QuickTime media backend: Render CIImage based video frames directly with Phonon core; compile fixes after merge. Phonon qt7; Compile fixes after merge. Phonon; complete integration. Update Phonon CMakeLists.txt. Update Phonon qt7 backend to 4.4.0. Update Phonon ds9 backend to 4.4.0. Update Phonon GStreamer backend to 4.4.0. ...
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-302-7/+28
| | |\ \
| | | * | Remove debug code disabling the video widget output control.Andrew den Exter2010-03-301-1/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Derick Hawcroft
| | | * | Force a repaint on changes in the native size of video frames.Andrew den Exter2010-03-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures old frame data is cleared when swithing to progressively smaller frame sizes. Reviewed-by: Derick Hawcroft
| | | * | Don't fill the video widget borders or background by default.Andrew den Exter2010-03-302-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can be enabled by settings setAutoFillBackground or the Qt::WA_OpaquePaintEvent to true. Reviewed-by: Dmytro Poplavskiy
| | * | | Fixed compilation on 64 bits Mac OS 10.5Dmytro Poplavskiy2010-03-301-1/+1
| | |/ / | | | | | | | | | | | | Reviewed-by: Justin McPherson
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Andrew den Exter2010-03-292-2/+4
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-294-3/+13
| | | |\ \
| | | | * | Update PulseAudio config.test.Justin McPherson2010-03-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally by Thiago Macieira Reviewed-by: Justin McPherson
| | | * | | 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-29102-1962/+3673
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-2999-1959/+3665
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Remove references to evr based renderer from .pro. Phonon core; compile fixes after merge. Phonon qt7; Compile fixes after merge. Phonon; complete integration. Update Phonon CMakeLists.txt. Update Phonon qt7 backend to 4.4.0. Update Phonon ds9 backend to 4.4.0. Update Phonon GStreamer backend to 4.4.0. Update Phonon core to 4.4.0
| | | | * Merge branch 'phonon-update' into 4.7Justin McPherson2010-03-2999-1959/+3665
| | | | |\
| | | | | * Remove references to evr based renderer from .pro.Justin McPherson2010-03-291-10/+1
| | | | | |
| | | | | * Phonon core; compile fixes after merge.Justin McPherson2010-03-262-2/+1
| | | | | |
| | | | | * Phonon qt7; Compile fixes after merge.Justin McPherson2010-03-265-12/+21
| | | | | |
| | | | | * Phonon; complete integration.Justin McPherson2010-03-2512-22/+1678
| | | | | |
| | | | | * Update Phonon CMakeLists.txt.Justin McPherson2010-03-251-1/+1
| | | | | |
| | | | | * Update Phonon qt7 backend to 4.4.0.Justin McPherson2010-03-2510-574/+137
| | | | | |
| | | | | * Update Phonon ds9 backend to 4.4.0.Justin McPherson2010-03-2533-996/+621
| | | | | |
| | | | | * Update Phonon GStreamer backend to 4.4.0.Justin McPherson2010-03-2520-142/+651
| | | | | |
| | | | | * Update Phonon core to 4.4.0Justin McPherson2010-03-2523-217/+571
| | | | | |
| | * | | | 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-2911-66/+660
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenGL paint engine. This makes video rendering with QGraphicsVideoItem much faster on 64 bits systems. Reviewed-by: Justin McPherson
* | | | | Correctly construct boolean JSValue'sAaron Kennedy2010-03-301-3/+9
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9205