| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| | |
Conflicts:
src/gui/text/qstatictext.cpp
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
...
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
...
|
| | | | |
| | | |
| | | |
| | | | |
Merging bearer header.
|
| | |\ \ \
| | |/ / |
|
| | |\ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
|
| |\ \ \ \ |
|
| | |\ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | |\ \ \
| | | | |/
| | | |/|
| | | | |
| | | | | |
Conflicts:
src/3rdparty/phonon/ds9/iodevicereader.cpp
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Can be enabled by settings setAutoFillBackground or the
Qt::WA_OpaquePaintEvent to true.
Reviewed-by: Dmytro Poplavskiy
|
| | | | |\ \ |
|
| | | | | |\ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Justin McPherson
|
| | | | | |/ /
| | | |/| |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Add videorenderer_vmr9.h/cpp back into ds9.pro
Reviewed-by: Justin McPherson
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Andrew den Exter
|
| | | | |/ /
| | | | |
| | | | |
| | | | | |
Reviewed-by: Dmytro Poplavskiy
|
| | | | |\ \ |
|
| | | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
received in the player session thread.
Reviewed-by: Justin McPherson
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
OpenGL paint engine.
This makes video rendering with QGraphicsVideoItem much faster on
64 bits systems.
Reviewed-by: Justin McPherson
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We don't need to do the conversion using QImage when NoOpaqueDetection
is specified.
Reviewed-by: muthu <qt-info@nokia.com>
|
| | |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| |\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
tools/qdoc3/generator.cpp
tools/qdoc3/node.cpp
|
| | | | |_|/
| | |/| | |
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-9118
Reviewed-by: Dmytro Poplavskiy
|
| | |/ / /
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Dmytro Poplavskiy
Task-number: QTBUG-9118
|
| | |/ /
|/| |
| | |
| | | |
open is public.
|
| | | |
| | |
| | |
| | | |
this fixes associating..
|
| | | |
| | |
| | |
| | | |
Resources are not allocated on error. Only free on success.
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | | |
Task-number: QT-3150
|
| | | | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/plugins/bearer/corewlan/qcorewlanengine.mm
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
...
|
| | | | |
| | | |
| | | |
| | | | |
6fb31d1e287d7def45c115eb56bcb9b0c5cb3c40.
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | |\ \ \ |
|
| | | |\ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
movie when MovieViewOutput output is disabled.
Reviewed-by: Justin McPherson
|
