| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Support linked fonts (.ltt) from standard font locations.
QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike
Fix anomaly demo control strip icon placement
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The internal font database was only populated with .ttf and .ccc files.
This patch adds .ltt as file type.
Without complete font type coverage in the fontstore, we may get a
mismatch in the internal association of font table and fontfamily.
Most probably, this will also fix the crash on SSE Satio's. SSE
seems to use .ltt files already on S60 5.0. An improvement needs to be
verified by an owner of such a device, however.
Task-number: QTBUG-8905
Reviewed-by: Aleksandar Sasha Babic
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike
Fix anomaly demo control strip icon placement
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Currently style defines QStyle::SH_ItemView_ActivateItemOnSingleClick,
which leads to itemview item activation only occur on double-click
(or tap). The item selection work native-like on Sym^3.
As a correction, style needs to check the passed styleoption and
check whether or not the state "Selected" is on. In these cases,
the itemactivation can proceed.
Task-number: QTBUG-10697
Reviewed-by: Miikka Heikkinen
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix path separators in install targets for MinGW+sh
fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
define qtPrepareTool() function and use it throughout
QNAM HTTP: And one more testcase
QNetworkAccessManager: Backends were tried in wrong order
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We inversed the order. HTTP shall be tried first, file:// last.
See https://bugs.webkit.org/show_bug.cgi?id=38935
Reviewed-by: Thiago
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix QUrl::isValid if the host contains invalid caracter.
QUrl: parsing of host name with an undercore.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If the host contains invalid caracter, QUrl::isValid should return false
Task-number: QTBUG-10355
Reviewed-by: thiago
|
| | | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is not supposed to be allowed, but it work with other browsers
Rask-number: QTBUG-7434
Reviewed-by: Thiago
Reviewed-by: Markus Goetz
(cherry picked from commit a8065da96b96fcc4baeca7615c2a4195c05cbc03)
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QNAM HTTP: Preemptive anti crash if() statement
QNAM HTTP: More testcases
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-10649
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
OpenVG blending modes from VG_KHR_advanced_blending extension
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This change introduces the extra blending modes that are
defined in the VG_KHR_advanced_blending extension. Patch
originally provided by contributor:
http://qt.gitorious.org/qt/qt/merge_requests/505
Reviewed-by: Julian de Bhal
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix spurious mouse click when dismissing a native menu
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Native menus are dismissed by the key press event.
The Qt application then receives the key up event, as it now has keyboard
focus.
The virtual mouse implementation now filters out select key press/release
which don't match the expected mouse button state.
Task-number: QTBUG-9860
Reviewed-by: Alessandro Portale
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Workaround for ATI driver bug when using QGraphicsEffect with GL.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If you forward declare a shader function which takes a sampler as
argument, the shader program will fail to link on ATI cards under
Windows.
Task-number: QTBUG-10510
Reviewed-by: Trond
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix wins def file for qtgui
Compilation fix for Metrowerks compiler
|
| | | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The .def file contained symbols for both:
public: static int __cdecl QEglContext::display(void)
public: int __thiscall QEglContext::display(void) const
But the autogenerated def file comments showed both of these as just
QEglContext::display(void)
Leading to confusion.
There is some bug in SBSv2 which made the postlink succeed on retry.
Task-number: QTBUG-10520
Reviewed-by: Trust Me
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed QFont to respect the italics constructor flag.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Creating a QFont with the constructor that takes the italic bool flag
didn't work properly, since the property wasn't set to be resolved.
It may be that the property should *always* be resolved, but to
minimize impact, it's only done now if you pass in 'true' for italics.
Reviewed-by: Eskil
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QNAM HTTP: Only force read when actual bytes available
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This should fix the problem where we were showing a warning
that didn't matter anyway.
Task-number: QTBUG-9619
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Don't crash when applications set Qt::WA_TranslucentBackground.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
After replacing some code with a function call to s60UpdateIsOpaque()
we introduced a crash for widgets that set
Qt::WA_TranslucentBackground. The reason for the crash was that the
Qt::WA_WState_Created attribute was being set before calling this
function, but *not* before setWinId() was being called. This meant that
s60UpdateIsOpaque() assumed that the window was created (and the handle
added to the widget map), but this was not actually the case.
The fix here is to move the call to s60UpdateIsOpaque() after the call
to setWinId() such that those assumptions are true.
Reviewed-by: Jani Hautakangas
|
| | |\ \ \ \
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Phonon QT7 backend; Don't release string after unsuccessful AudioDeviceGetProperty().
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
AudioDeviceGetProperty().
Reviewed-by:Andrew den Exter
|
| | |\ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed QGLPixmapDropShadowFilter on Nvidia hardware.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
There seems to be a driver bug that causes glTexSubImage2D() to not
align data correctly when uploading a GL_ALPHA texture.
Task-number: related to QTBUG-10510
Reviewed-by: Samuel
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed typo in QAudioInput bufferSize documentation
Spectrum Analyzer demo Symbian fix
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Docs stated that the bufferSize was a value in milliseconds.
Corrected this to bytes.
Reviewed-by: trustme
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-10512
Reviewed-by: Kim
|
| | |\ \ \ \ \
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix for torn off menus that were way too big
Fixed an issue with pixmaps not being released correctly in the GL 1 engine.
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix for torn off menus that were way too big
Fixed an issue with pixmaps not being released correctly in the GL 1 engine.
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
When a pixmap is bound using the texture_from_pixmap extension we retain
a reference to the pixmap to stop us destroying it before swapBuffers()
or glFlush() is called. The references were not cleared out correctly
in the GL 1 engine.
Task-number: QTBUG-10529
Reviewed-by: Samuel
|
| | |\ \ \ \ \ \
| | |_|_|_|/ /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Improved mapping of locales on symbian.
An improvement to the previous commit.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Map Latin American Spanish to es_MX - Spanish in Mexica - the locale data for
those two locales are the same, so it should be more or less safe. The proper
solution is to add support for es-419_419 and es_419 locales to QLocale.
Task-number: QT-3312
Reviewed-by: trustme
|
| | | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This fixes 005dc6c7448a724d3df496a1e528199f5a638ce0 that was pushed by mistake.
Task-number: QT-3349
Reviewed-by: trustme
|
| | |\ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style will draw focus frame to a PushButton with any stylesheeting
|
| | | |\ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Due to incorrect braces in the if-within-if, QS60Style decided to use
QCommonStyle for styling focus frame into QPushButton when button had
*any* kind of stylesheet.
Corrected the braces.
Task-number: QTBUG-10549
Reviewed-by: Alessandro Portale
|
| | |\ \ \ \ \ \
| | |_|/ / / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixes a crash in gestures.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This is a partial backport of a fix that was pushed to 4.7
(734ba1f540aaedc4a3558268bd7350c0b15325a4)
Task-number: QT-3349
Reviewed-by: trustme
|
| | |\ \ \ \ \ \
| | | |_|_|/ /
| | |/| | | /
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Return correct formats supported lists from Symbian audio backend
|
| | | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* QAudioDeviceInfoInternal functions now call CMMFDevSound::InitializeL()
The root cause of QTBUG-10205 was that CMMFDevSound::IntitializeL()
was not called before CMMFDevSound::Capabilities(), resulting in
incorrect values being returned by QAudioDeviceInfo 'supported format'
functions. Resolving this was not straightforward because, while
QAudioDeviceInfo is an entirely synchronous API,
CMMFDevSound::InitializeL() is an asynchronous function. The changes
therefore include a while(QApplication::instance()->processEvents(...))
loop, which is not a particularly elegant solution.
* Encapsulated all interaction with CMMFDevSound API in DevSoundWrapper
class
Because the original bug fix required QAudioDeviceInfoInternal to call
CMMFDevSound::InitializeL(), MDevSoundObserver callback functions had
to be implemented in QAudioDeviceInfoInternal. Rather than pollute
QAudioDeviceInfoInternal, a new class, DevSoundWrapper, was created
which encapsulates all interaction with CMMFDevSound, and therefore
implements MDevSoundObserver. QAudioInputPrivate and
QAudioOutputPrivate now call CMMFDevSound via DevSoundWrapper, with
only the required MDevSoundObserver callbacks forwarded on via signals.
After fixing this bug, running the auto test suites exposed a number
of regressions which had been introduced by the necessary refactoring
described above; this commit therefore also includes fixes for the
following:
* No stateChanged() signal emitted during DevSound initialization
Previously, QAudioInput / QAudioOutput would emit a state change from
StoppedState to IdleState or ActiveState, as soon as start() was called.
In the case where the requested format is subsequently found to be
unsupported, in addition to the error() value being set to OpenError,
a second state change would be emitted, back to StoppedState. This is
not the behaviour exhibited by the other platforms' backends,
and therefore caused an auto test failure. Now, the backend only
transitions to IdleState / ActiveState on successful initialization.
* Stop emitting notify() signal when notifyInterval is set to zero
* Call CMMFDevSound::RecordInitL() from QAudioInput::resume() if no
buffer is currently held
This is necessary in order to restart the data flow.
* Call CMMFDevSound::BufferFilled() from QAudioOutput::resume() in push
mode
The auto test does not resume pushing data to QAudioOutput until
'bytesFree() >= periodSize()' becomes true. Because, for the Symbian
backend, periodSize() == bufferSize(), this condition is only met when a
new buffer is provided by DevSound via BufferToBeFilled().
Task-number: QTBUG-10205
|
| | |\ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Update to low-level audio documentation.
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by:Gareth Stockwell
|
