| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add translation context to qsTr() benchmark
QtScript: Add autotest for enumeration of QMetaObject properties
QNAM HTTP: Pipelining changes
|
| | |
| |
| |
| |
| | |
That's a more realistic case, since translations are usually
tied to a physical script.
|
| | |
| |
| |
| |
| |
| | |
The issue reported in QTBUG-3665 had been fixed since 4.6.0, but
it went unnoticed that there had been a bug in the first place
since there was no test for this behavior.
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QNAM HTTP: Pipelining changes
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Re-wrote some code to improve pipelining efficiency. Greatly helps
with combining into one TCP packet.
Task-number: QTBUG-9894
Task-number: QT-3280
Reviewed-by: Peter Hartmann
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixes auto-test failure for 9da13ea53aec6d841ba7f416531d6c52d4368df4.
Fixes tooltips for QGraphicsProxyWidget.
|
| | | | |
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixes tooltips for QGraphicsProxyWidget.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Help event was not propagated to the widget. Also fixes tooltip value
propagation when setting it on the proxy or on the widget.
Autotest included.
Task-number: QTBUG-5349
Reviewed-by: bnilsen
|
| |\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
'#' gets inserted to editor when changing FEP modes
ComboBox popuplist is not correctly layouted in fullscreen mode
Dialogs in landscape mode are not correctly positioned
Slider graphics does not look correct in N95 (part2)
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This is regression in QCoeFepInputContext::commitCurrentString.
Recent member variable removal broke the existing functionality.
Fixed by removing the orphaned return-statement.
Task-number: QTBUG-9867
Reviewed-by: Alessandro Portale
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This is partial fix to issue 9913.
Now combobox popup is correctly positioned with AVKON StaCon
(Combined Status and Control Pane). Popup is centered onscreen in
this case.
Task-number: QTBUG-9913
Reviewed-by: Janne Anttila
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If AVKON is using a StaCon component (combined Status and Control
Pane), then dialogs were incorrectly positioned. Native side,
places dialogs shown with StaCon to right border, whereas the
current implementation was placing them to left.
Fixed, by asking from AVKON the rect for StaCon. If it is empty,
then use the existing placement rules, otherwise place to the right
border.
Task-number: QTBUG-9910
Reviewed-by: Janne Anttila
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The original fix for this, only fixed horizontal widgets.
But the same issue can be reproduced also with vertical widgets.
This latter fix replaces the orginal fix.
Task-number: QTBUG-9854
Reviewed-by: Alessandro Portale
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Slider graphics does not look correct in N95
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The upscaling of theme graphics fails, if the original rect is taller
than upscaled graphics rect height. This makes the start and end parts
of the graphics appear as shorter then they should be.
Fixed by forcing the destrination rect height to be used after
upscaling the graphics.
Task-number: QTBUG-9854
Reviewed-by: Janne Anttila
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed compiler warning
Phonon MMF: fixed crash during opening of video clip
Phonon MMF: ensure initial volume is applied
Phonon MMF: fix state changes emitted during playlist handling
Phonon MMF: calling pause() when in StoppedState triggers stateChanged()
Phonon MMF: change to PausedState, not StoppedState when finished
Phonon MMF: Suppress intermediate stateChanged() signal
Phonon MMF: Emit tick() signal
Phonon MMF: Emit prefinishMarkReached(), finished() signals
Phonon MMF: Removed compiler warning
tst_mediaobject: ensure MediaObject is in StoppedState before each step
tst_mediaobject: Removed non-portable escape codes from output
tst_mediaobject: Ensure playSDP step cleanup is run
tst_mediaobject: Removed compiler warnings
tst_mediaobject: Removed compiler warnings
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: trustme
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
A crash was observed during opening a video clip, and was traced
to dereferencing a null m_player pointer in
DsaVideoPlayer::handleParametersChanged(), which is called during
construction, but before createPlayer() has been called.
This was reproducible using the following sequence:
1. Launch qmediaplayer
2. Play an audio clip
3. Open a video clip
However, the following sequence worked as expected:
1. Launch qmediaplayer
2. Play a video clip
3. Play an audio clip
4. Play a video clip
...
It is not clear which commit introduced this defect.
Reviewed-by: Frans Englich
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
A recent change meant that, if the user set a volume level before
loading a clip into the MediaObject, that initial volume level was
not applied to the audio output.
Reviewed-by: Frans Englich
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This change is required by the testPlayBeforeFinish step in
tst_mediaobject. This test starts playback of one track, then calls
MediaObject::setCurrentSource() followed by MediaObject::play(). The
step checks that the following stateChanged() signals are emitted
by the MediaObject:
1. StoppedState (optionally)
2. LoadingState
3. BufferingState or PlayingState
The state changes emitted by the Phonon MMF backend were:
1. PlayingState -> StoppedState
2. LoadingState -> PlayingState
This patch fixes the discontinuity in state changes which occurred
while processing a playlist.
Reviewed-by: Frans Englich
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Previously, the MMF backend simply swallowed a call to pause() when in
StoppedState. However, the stopToPause step in tst_mediaobject requires
the backend to emit a stateChanged signal when this happens.
Reviewed-by: Frans Englich
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This behaviour is required by the testPauseOnFinish step in
tst_mediaobject.
Reviewed-by: Frans Englich
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If MediaObject::play() is called while the object is in LoadingState,
playback will start once loading is completed. Previously, the
Symbian backend at this point emitted two stateChanged signals - first
to StoppedState and then to PlayingState.
The testPlayOnFinish step in tst_mediaobject requires that only one
state change occurs: directly from LoadingState to PlayingState.
Reviewed-by: Frans Englich
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fixes testTickSignal step in tst_mediaobject.
Task-number: QTBUG-9339
Reviewed-by: Frans Englich
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fixes testPrefinishMark step in tst_mediaobject.
Task-number: QTBUG-9339
Reviewed-by: Frans Englich
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Frans Englich
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Many of the steps in the tst_mediaobject suite (a) check that the
MediaObject is in StoppedState at the start of the step and (b) call
stopPlayback() at the end. If, however, a QTest check fails during
the test, stopPlayback may not be called. This patch adds a call to
MediaObject::stop() in the suite's init() function.
This is a symptom of a wider problem with this test suite, namely that
it re-uses a single instance of Phonon::MediaObject for all steps. Given
the highly stateful nature of MediaObject, this can lead to test steps
failing due to some state which was erroneously carried forward from an
earlier step. While this test suite design may more faithfully
represent real-world usage of Phonon, it makes tracking down the root
causes of test failures needlessly difficult.
Reviewed-by: Frans Englich
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Test step was outputting ANSI escape codes in order to highlight
certain text. These codes are not natively supported by Windows
consoles, resulting in raw escape codes appearing in the output.
Reviewed-by: Frans Englich
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This step previously did not guarantee that the m_media object
would be left in StoppedState, which in turn meant that following
test steps could fail.
Task-number: QTBUG-9339
Reviewed-by: Frans Englich
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Compiler warnings concerned unreachable code.
Reviewed-by: Frans Englich
|
| |/ / /
| | |
| | |
| | |
| | |
| | | |
Removed declaration of variables which are subsequently unused.
Reviewed-by: Frans Englich
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Phonon MMF: fixed typo in trace statement
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
This builds under RVCT 2.2 (although obviously the debug output will
contain garbage), but causes a compiler error with RVCT 4.
Reviewed-by: trustme
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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 ( be2489a618c909c4a82d927f9fff9d12feafeb30 )
QtScript: Add tests for translation of multiple scripts
QtScript: Add test for translation disambiguation
QtScript: Fix call stack issue with qsTr() when JIT is enabled
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
( be2489a618c909c4a82d927f9fff9d12feafeb30 )
Changes in WebKit/qt since the last update:
* http://trac.webkit.org/changeset/50486 -- Allow a frame to go back to copy-on-scroll when it ceases being overlapped
|
| | | |
| | |
| | |
| | | |
Suggested by Olivier.
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When the JIT is enabled, as well as JIT_OPTIMIZE_NATIVE_CALL defined,
NativeFunctionWrapper is a typedef for JSFunction. This has the
consequence that the native call frame will not be fully initialized
by JIT-generated code (because it shouldn't have to); in particular,
ExecState::codeBlock() is not set up.
qsTr() relies on codeBlock() to return a sensible value, though, so
it breaks this contract.
By making qsTr a PrototypeFunction, the JIT will detect that the
function call needs more elaborate setup, i.e. initialize codeBlock()
as well.
Reviewed-by: Olivier Goffart
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
merge commit c638ddc70f6a8196f2c8b11808ab01510233a0ee from harfbuzz:
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
commit c638ddc70f6a8196f2c8b11808ab01510233a0ee
Author: Lars Knoll <lars.knoll@nokia.com>
Date: Wed Apr 14 17:01:49 2010 +0200
Fix a bug in malayalam shaping
See http://bugreports.qt.nokia.com/browse/QTBUG-1887.
We were not finding the base character correctly in the case
where the syllable contained a ZWJ.
In addition, the indic OT specs require us to also apply the 'loca',
'cjct' and 'calt' features. They seem to be mostly unused by todays
fonts, but we should better apply them anyways.
Task-number: QTBUG-1887
Reviewed-by: Eskil
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix autotest failure: QIODevice::read() on a closed device must return -1
|
| | | | |
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style: HouseKeeping task
QS60Style: In a very short combobox, text is cut
QS60Style: Sometimes progressbars do not animate
Implement OpenVG buffer scrolling and enable it on Symbian.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Remove unnecessary comment.
Added one @todo comment.
Some whitespace corrections.
Removed unnecessary QStyle scopes.
Reviewed-by: Alessandro Portale
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If QComboBox is very short, it is possible that the combobox text is
cut.
This is due to two reasons:
1) Style does not take into account text eliding (which should be
preferred over clipping)
2) Clipping text rect is done with orginal text rect, before it is
adjusted for borders, icons etc.
Style is changed that it doesn't use clipping rect and uses
text eliding.
Task-number: QTBUG-9837
Reviewed-by: Alessandro Portale
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Style removes every progressbar from animation list whenever
*any* QWidget is hidden/shown. To ensure that the animation list is
only tempered with possible animation supporting qwidgets,
re-interpret cast them to QProgressBar. If this works, then
clear the animation list.
Task-number: QTBUG-9836
Reviewed-by: Alessandro Portale
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Implement OpenVG buffer scrolling and enable it on Symbian.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Add support for accelerated scrolling in the "direct" window surface
implementation. Using vgCopyPixels(), the already rasterized content on
the surface can be shifted to a new location such that only a portion
of the suqsequent frame needs to be repainted instead of the entire
frame.
This only works when the "preserved" EGL swap behavior is enabled and
the impact on performance is highly dependant on the specific hardware
platform in use.
Task-number: QT-2972
Reviewed-by: Rhys Weatherley
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QAbstractScrollArea StyleSheet: fix drawing of border with SH_ScrollView_FrameOnlyAroundContents
|
