| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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/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
|
| |
| |
| |
| | |
Suggested by Olivier.
|
| | |
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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-2:
QAbstractScrollArea StyleSheet: fix drawing of border with SH_ScrollView_FrameOnlyAroundContents
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
SH_ScrollView_FrameOnlyAroundContents
- Since Qt 4.6.0, the frame is drawn by PE_Widget, but there we do not take
in account the scrollbar for the case where SH_ScrollView_FrameOnlyAroundContents
is true.
- We also reserved too much space for the border, as we included the
native border as well in the computation, so do not reserve additional
space by setting PM_ScrollView_ScrollBarSpacing to 0
Task-number: QTBUG-9821
Reviewed-by: jbache
|
| |
| |
| |
| | |
And fix two silly typos in the error messages.
|
| |
| |
| |
| | |
Task-number: QTBUG-7359
|
| | |
|
| | |
|
|/
|
|
|
|
|
|
|
|
|
| |
Search up the call stack to find the first non-empty source URL.
Also and add an autotest for the QtScript translator functions
since there was none (their presence was checked, but not their
behavior...).
Task-number: QTBUG-9775
Reviewed-by: Olivier Goffart
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Rules like "Foo { border: 2px solid; }" does not specify the border color.
When the border color is not specified, it is assumed to be black.
When reading the brush value from the cache, we should take that
into account.
Note that this logic cannot be moved into brushFromData() as it is different
for the background. (when no color is specified, it is assumed to be transparent)
Reviewed-by: jbache
Task-number: QTBUG-9674 (part one)
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Autotest: same as previous commit
Autotest: fix network test failure
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enable preserved swap behavior when surface is created due to resize.
Generate triggered signal even the action launches menu in Symbian.
Symbian emulator: unload file server so apps can be recompiled.
Clear QFontCache TLS content before nullifying TLS pointer.
Fixed focus and window activation events on Symbian when opening menu.
QTBUG-4887 and other exception safety fixes
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QTBUG-4887 and other exception safety fixes
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This change includes a fix for QTBUG-4887 and other exception safety
problems found while testing it.
The QTBUG-4887 fix is to qimage.cpp. QImage doesn't throw exceptions on
failure like a proper class should, instead it tries to fail "nice".
What happens here is that setAlphaChannel would crash on OOM as after
the convertToFormat call, d could be NULL. This new version checks the
result of the conversion before using it.
The other fixes are all cases where exceptions were thrown from
destructors. I added code to the test app to help debug these cases,
and I fixed all the problems I found.
With these changes, tst_exceptionsafety_objects runs and passes on the
Symbian emulator.
Reviewed-by: Shane Kearns
|
|\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: we don't ship a qconfig executable in the Windows CE packages
Fixed possible data corruption in the triangulating stroker.
Fixed caching of QPainter patterns in the GL 2 engine.
Fixes CursorChange and TooltipChange events delivery for QGraphicsWidget
QTableView: fix spans corruption when removing spans.
Fixes painting artifacts when scaling a QGraphicsProxyWidget.
Fix <MemLeak> valgrind report shows memory leak for QImage::save().
Fix test sql for sql server.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
As the documentation mentions, these two events are delivered
respectively after the cursor has changed and after the tooltip has
changed. These two events were previously delivered just before.
This patch is needed for fixing QTBUG-5349 even if it is not directly
related.
Auto-test included.
Reviewed-by: bnilsen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- We should not do -1 after erasing, as it is done later on.
- We should consider the 0 height even if it is not the last span.
- Added an assert.
Task-number: QTBUG-9631
Reviewed-by: Gabriel
|
| |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix test sql for sql server.
|
| | |/
| | |
| | |
| | | |
Sql server requires explicitly setting fields to be nullable.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In 4.5, changing the prototype of the (custom) global object used
to "Just Work"(tm).
In the JSC-based back-end, the built-in global object acts as a
proxy if a custom global object is set, because JSC doesn't (yet,
anyway) provide a way to replace the global object.
To complicate this further, we also have a proxy to the original
global object (that bypasses the custom global object proxying (!)).
This is so that properties of the original global object can
still be accessed with the QtScript C++ API when a custom global
object has been set.
Unfortunately, JSObject::prototype()/setPrototype() are not virtual,
meaning that a change of prototype in the source object is not
reflected in the proxy or vice versa.
Work around this for now by syncing the prototype at the appropriate
places (QScriptEngine::setGlobalObject(), QScriptValue::setPrototype()).
This fixes all except the case when a prototype is set from JS,
since such a write doesn't go through our public C++ API. But this
case can be detected and handled by the global object's
JSObject::put() reimplementation. Created a separate report for that
issue: QTBUG-9737.
Task-number: QTBUG-7066
Reviewed-by: Jedrzej Nowacki
|
|/ /
| |
| |
| | |
Reviewed-by: Trust Me
|
|/
|
|
| |
Reviewed-by: jason mcdonald
|
|
|
|
| |
Reviewed-by: rohan mcgovern
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Needs investigation of autotest failures on QWS, osx, win platforms.
This reverts commit 741b75b8e595a26944ba8fca8835463787b02676.
Conflicts:
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
|
|\
| |
| |
| |
| | |
Conflicts:
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
|
| |
| |
| |
| |
| | |
Merge-request: 541
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QGraphicsObject"
This reverts commit 4be83fa7337c5a4eb7b0ce085aa5854af5d33252.
Conflicts:
src/gui/graphicsview/qgraphicswidget.cpp
This drops the support of QML on top of 4.6
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 79a02c86c445e50630bcae62a4505f212281ec8b.
Conflicts:
src/gui/graphicsview/qgraphicswidget.cpp
This drop the support of QML on top of 4.6
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
changes"
This reverts commit 13bccd4ade76dd8a9c1cc067cc2b8da69c11def2.
Conflicts:
src/gui/graphicsview/qgraphicswidget.cpp
Drop the support of QML on top of 4.6
|
| |
| |
| |
| |
| |
| | |
This reverts commit 87fae30fc63460e0ed2cc98f55a22e28d7520311.
This drop the support of QML on top of 4.6
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: Added links and notes to modules, ActiveQt and XMLPatterns docs.
Compile on MingW
struct -> class, it's better.
Add a a layout property in QGraphicsWidget.
Fix QFileSystemModel to not install useless watchers on the filesystem
|
| | |
| | |
| | |
| | | |
Reviewed-by:michael brasser
|
| |/
| |
| |
| |
| |
| |
| | |
You can't build for debug mode on Windows if Qt wasn't built in debug
mode. So force the selection to be exactly what Qt was built.
Reviewed-by: Trust Me
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Use QSKIP rather than commenting a failure.
|
| | |
| | |
| | |
| | | |
Reviewed-by:TrustMe
|