| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
| |
The proper define should be Q_WS_WIN.
Task-number: QTBUG-12040
Reviewed-by: Prasanth
Reviewed-by: Eskil
|
| |\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
typos fixed
|
| | |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Use lower case for including system header files
Added trace statements to Phonon MMF backend
MMF Phonon backend: call winId() from VideoWidget constructor
Fixed crash which occurs when switching between video clips
Close media clip before creating new player object
Enable bufferStatus signal during video clip loading on NGA platforms
Prevent crash when video is played without a VideoWidget
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
All platform includes are now lower case, i.e. '#include <foobar.h>'
rather than '#include <FooBar.h>'.
Note that Qt includes are still camel case, e.g.
'#include <QtGui/QWidget>'
Task-number: QTBUG-6528
Reviewed-by: trustme
|
| | | |
| | |
| | |
| | | |
Reviewed-by: trustme
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is to be consistent with the backends for other platforms, which
also call QWidget::winId() on the VideoWidget (or one of its children)
during construction.
Reviewed-by: Thierry Bastian
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When Phonon::MediaObject::setCurrentSource() is called when the
MediaObject is connected to a Phonon::VideoWidget, the
MMF::AbstractVideoOutput pointer is propagated inside the backend
from the first MMF::AbstractVideoPlayer to the second.
If the VideoWidget is subsquently re-sized, the code path enters
the ScaleFactors branch of the
MMF::SurfaceVideoPlayer::handleParametersChanged function. At this
point, m_displayWindow is still set to the inital null value, and the
assertion therefore fails.
This change ensures that m_displayWindow is updated before attempting
to apply the scale factor change.
Task-number: QTBUG-11377
Reviewed-by: Thierry Bastian
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Failure to Close() an existing MMF player utility object before
creating a new one - which happens in the MMF backend's implementation
of Phonon::MediaObject::setCurrentSource() - causes intialization of the
newly-created utility to fail later on.
Task-number: QTBUG-11377
Reviewed-by: Thierry Bastian
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
CVideoPlayerUtility::RegisterForVideoLoadingNotification() was only
called in the DSA, not the NGA, variant of the Phonon MMF backend.
Task-number: QTBUG-11378
Reviewed-by: Thierry Bastian
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The Phonon API allows video to be played via a Phonon::MediaObject,
even if no Phonon::VideoWidget has been connected to it. This
patch prevents the Phonon MMF backend crashing in this scenario
due to dereferencing a null pointer.
Reviewed-by: Thierry Bastian
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix crash when removing columns in merged row
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change 4b709b41f5a7ae8dc6e537b644158f5201ce0a98 tried to make sure that
rows with merged cells would not be completely removed, as this would
cause a crash. However, when removing just a few columns from a merged
cell, the span of the cell should be reduced by the number of columns
removed. The "touched" guard would cause the span to be decreased a
maximum of one time, regardless of how many columns were removed,
leaving the table in an invalid state, as the column count would be
smaller than the span of the cell. This would assert later on.
To avoid this, we only guard against removal, not against decreasing
the span.
Task-number: QTBUG-11646
Reviewed-by: Thomas Zander
|
| |\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Don't try and use QFactoryLoader when relevant features are turned off.
|
| | |\ \ \
|/ / / /
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Don't try and use QFactoryLoader when relevant features are turned off.
|
| | |/ /
| | |
| | |
| | |
| | | |
Task-number: QTBUG-11900
Reviewed-by: Andrew den Exter
|
| |\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Spectrum demo: fixed installation
Spectrum build: fixed DLL rpath
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
All binaries must be written into $$QT_BUILD_DIR/demos/spectrum in
order for them to be correctly installed.
Task-number: QTBUG-11572
Task-number: QTBUG-11756
Reviewed-by: Andy Shaw
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Rather than explicitly modifying LD_LIBRARY_PATH using a shell script
when the application is launched, the relative path from the
application binary to the FFT library is encoded in the application
using an --rpath flag.
Task-number: QTBUG-11756
Reviewed-by: Andy Shaw
|
| |\ \
| |/
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Revert "Support time zone designator in QDateTime::fromString() based on ISO 8601-2004 standard."
|
| | |
| |
| |
| |
| |
| | |
8601-2004 standard."
This reverts commit 752d46c90ee0fc5f06f01feedd8e0659178b15d4.
|
| |\ \
| |/
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Support time zone designator in QDateTime::fromString() based on ISO 8601-2004 standard.
|
| |/
|
|
|
|
|
|
|
| |
8601-2004 standard.
Task-number: QTBUG-11623
Reviewed-by: Denis Dzyubenko
Reviewed-by: David Boddie
|
| |\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Include qmath.h to get the definition of ceil()
|
| | |
| |
| |
| | |
Reviewed-by: Julian de Bhal
|
| |\ \
| |/
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Removed missing symbols from DEF files.
Fixed missing clip when computing the graphics item effect source rect.
|
| | |
| |
| |
| | |
RevBy: Jason Barron
|
| |/
|
|
|
|
|
|
|
|
| |
If item clips children to shape we should take that into account when
computing the source rect, to avoid creating unnecessary large source
pixmaps which might have a significant performance impact.
Task-number: QT-3551
Reviewed-by: Gunnar
Reviewed-by: Trond
|
| |\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Segmentation Fault in QAudioOutputPrivate::freeBlocks() caused by wrong
|
| |/
|
|
|
|
|
| |
pointer increment
Task-number:QTBUG-11883
Reviewed-by:Andrew den Exter
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Using the remaining valid data to construct the QTime object when msec parsing failed.
Fix compile error in QFileDialog autotest
Fix RVCT compile error in QGraphicsSceneIndex autotest
Fix QXmlQuery autotest on Symbian
|
| | |
| |
| |
| |
| |
| |
| |
| | |
parsing failed.
It's relevant with QTBUG-11623, but not a fix for it.
Reviewed-by: Aleksandar Sasha Babic
|
| | |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The test code used the 'using' keyword to try and change access control
of a base class method from protected to public.
With the RVCT 2.2 compiler, 'using' imports the function(s) from the base
class, but they retain their existing access control.
Used an inline public function to call the base class as a workaround
Reviewed-by: mread
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Deployment of the test files to ../xmlpatterns resolves to
c:/private/xmlpatterns, which is an illegal location to deploy to on
symbian.
Changed the deployment and test to put the xmlpatterns directory inside
the app's private directory on symbian
Regression tested on windows build.
Reviewed-by: mread
|
| |\ \
| |/
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Avoid blurry text with OpenVG on Symbian
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Qt's graphics system uses qreal as measurement unit.
The established paint engines (such as "raster") implicitly
round textitem coordinates for technical reasons, e.g. for
optimized blitting.
Some Qt based Ui libraries (such as QWidgets) can in some
cases cause textitems to be drawn on non-integer coordinates.
In particular, this happens when centering text.
Since these libraries have been developed against the
established paint engines with implicit rounding, these
non-integer coordinates were never an issue.
The new OpenVG paintengine took these coordinates seriously
without rounding them. On some OpenVG implementations (e.g.
that of some Symbian phones), this led to blurry text
rendering.
This patch adds coordinate rounding for unscaled, unrotated
textitems to the OpenVG paintengine. So that it does the
same as the raster paint engine.
Task-number: QT-3071
Reviewed-By: Jason Barron
|
| |\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Layout direction change by key should change alignment of QLineEdit
|
| |/
|
|
|
|
|
|
|
|
|
|
|
| |
When QLineControl was split out of QLineEdit, a regression was
introduced. When the layout direction was altered by a key press,
the layout direction of the QLineControl would be set, but not the
QLineEdit. This would in turn mean that QLineEdit would use the wrong
layout direction for its visual alignment. Patch is a small hack to
read back the layout direction from the control after it has been
set.
Task-number: QTBUG-11204
Reviewed-by: Trond
|
| |\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
QAudioInput push mode does not work
|
| |/
|
|
|
| |
Task-number:QTBUG-11755
Reviewed-by:Derick Hawcroft
|
| |\
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( fc13f9b396e1448cd71266f56ba7a93de5cf6ed9 )
|
| | |
| |
| |
| |
| |
| |
| |
| | |
( fc13f9b396e1448cd71266f56ba7a93de5cf6ed9 )
Changes in WebKit/qt since the last update:
* Benjamin's update/fixes to the backport of https://bugs.webkit.org/show_bug.cgi?id=33150
|
| |\ \
| |/
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 4b88f595ab62b7c5f703a286c4f5f13f8784a936
|
| |/
|
|
|
|
|
|
| |
4b88f595ab62b7c5f703a286c4f5f13f8784a936
* Fix crash/regression in thai line word breaking when libthai is installed:
Commit 4b88f595ab62b7c5f703a286c4f5f13f8784a936 upstream ensures the zero
termination of the string passed to libthai.
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fix compile error on win32 with multimedia lib.
Fix compile err with win2005 compiler for multimedia lib.
Fixed compile error in multimedia module
Fixed compile error introduced by win32 surround sound support change.
Added surround sound support to alsa low-level audio backend.
Added surround sound support to win32 low-level audio backend.
|
| | |
| |
| |
| | |
Reviewed-by:TrustMe
|
| | |\ |
|
| | | |\
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed compile error in multimedia module
Fixed compile error introduced by win32 surround sound support change.
Added surround sound support to alsa low-level audio backend.
Added surround sound support to win32 low-level audio backend.
|
| | |/
| |
| |
| | |
Reviewed-by:TrustMe
|
