| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | |
| | |
| | |
| | | |
Reviewed-by: Harald Fernengel
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In Sym^3 when virtual keyboard is opened, text selection is not
carried over from editor-like widget to the VKB. This is due that
new implementation of AVKON FEP manager requires that clients indicate
with editor flags that they can handle text selection.
Task-number: QT-3277
Reviewed-by: Janne Anttila
|
|/
|
|
|
|
|
|
|
|
|
|
| |
Final commit for this task.
For widgets that use the highlighted list/table graphic, style now
supports pressed state for the highlight. Style filters mouse press and
release events and sets the highlight graphics to be correct based
on mouse events (i.e. touch) it gets.
Task-number: QT-2298
Reviewed-by: Alessandro Portale
|
|\
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
CSS: fixes border only affecting the first widget.
fix closing state in QLocalSocket on Windows
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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:
Fix segfault, if QPixmap::loadFromData() fails
|
| |
| |
| |
| | |
Reviewed-by: Harald Fernengel
|
|\ \
| |/
|/|
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix crash with QTextEdit::textChanged() when deleting a character
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QTextEdit::textChanged() will be emitted from a function called from
within QTextCursorPrivate. If the code connected to textChanged()
makes a local copy of the current text cursor and then causes it
to detach, we will crash when returning to QTextCursorPrivate and
trying to access the now-deleted data. To avoid this, we make a local
reference to the current text cursor that gives us a guarantee that
it will be valid throughout the delete-call.
Task-number: QTBUG-9599
Reviewed-by: Gunnar
|
| |
| |
| |
| |
| |
| |
| |
| | |
This fixes a problem with accessibility and QFileDialog, in addition the
fix to complexwidgets.cpp will also fix any itemview that uses a root
index.
Reviewed-by: Jan-Arve
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Triggered signal is useful for detecting native 'Options' menu
launches in Symbian. QMenu::aboutToShow event is currently also not
generated, but that is part of another bug report. And
QMenu::aboutToShow would not even be generated for 'Options' menu
itself but only for its sub/cascade menus.
Task-number: QTBUG-9669
Reviewed-by: Sami Merila
|
| |
| |
| |
| |
| |
| |
| |
| | |
If not cleared server handles are left open causing
Font Server to Panic with KErrInUse in Symbian.
Task-number: QTBUG-9565
Reviewed-by: Simon Hausmann
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
As described in QTBUG-8698, Qt for Symbian has been generating
incorrect focus and window activation events. This has happened since
launching menu from QSoftkeyManager with TryDisplayMenuBarL, invokes
eventually QSymbianControl::FocusChanged. But when the FocusChanged is
called menu being launched is not yet set to visible, meaning that
IsDisplayingMenuOrDialog returns false.
Because there is no way in platform to detect that menu is being
launhced, the fix is to add a new flag QS60Data, which can be used to
detect if FocusChanged event is received due to the fact that menu
is being constructed/launched.
Task-number: QTBUG-8698
* Fixes issues 2, 3 and 4
Reviewed-by: Sami Merila
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Incorrect simple conversion of the exposed rect from QRectF to QRect
when rendering the widget.
Task-number: QTBUG-7296
Reviewed-by: bnilsen
|
|/ /
| |
| |
| | |
Reviewed-by: Marius Storm-Olsen
|
|\ \
| |/
|/|
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix crash for multiscript text in QTextEngine::boundingBox()
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The logClusters pointer is already adjusted for the item, so it should
be indexed relative to the item, hence from 0 to itemLength-1. Adding
pos to the index would give us a random value for all script items > 0.
Thus this would sometimes crash for text that spanned several scripts,
since we would sometimes get a value back which was outside the bounds
of the glyph array.
Task-number: QTBUG-9374
Reviewed-by: Samuel
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
During softkey refactoring this piece of code get changes, but the
changed code did not work correctly if window had no softkey actions.
Switched back to old way where softkey source is stored to variable,
and windowType is asked from stored variable. If softkey source is
dialog or popup, "Exit" is not added automatically to RSK.
Task-number: QT-2203
Reviewed-by: Sami Merila
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Implementing QFontEngineS60::getSfntTableData()
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
That function was not yet implementing. Its absense caused some
Harfbuzz based shaping not to happen.
See Robert DeWolf's comment on task QTBUG-5857
Since QFontEngineS60 is private implementation and generally not
exported, no symbols need to be added to the .def files for this patch.
Task-number: QTBUG-5857
Reviewed-by: trustme
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 544
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In some cases the fileiconprovider has been reported to crash
while accessing icons with overlays. This situation got
worse with change b67bd25be08b54c3e6e49b2b9429e54ff58db268
since these cases were often hidden by broken caching.
The workaround for now is to simply check that the hIcon structure
is non empty before converting the icon.
Task-number: QTBUG-8324
Reviewed-by: ogoffart
|
|/
|
|
|
| |
Merge-request: 541
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Revert "Add a children private property needed for QML to support QGraphicsObject"
Revert "struct -> class, it's better."
Revert "Add NOTIFY to size property so QML bindings are working fine."
Revert "Better handling for NOTIFY in QGraphicsWidget regarding geometry changes"
Revert "Add a a layout property in QGraphicsWidget."
Add a workaround for a bug in Mac filesystem watcher.
Another "off by 1" problem in OpenVG - in paths this time.
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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 1d094129c0c3994df4e59cd9eda6981a7b131903.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Reviewed-by:TrustMe
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
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:TrustMe
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by:michael brasser
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix QFileSystemModel to not install useless watchers on the filesystem
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When someone call setRootPath we need to remove the previous watcher.
This save memory and also it avoids Qt Creator to run out of filesystem
watcher which then leads to a crash. If you call setRootPath on the
previous path all changes that might happen in between will be propagated
in the model.
Task-number:QTBUG-8632
Reviewed-by:Friedemann Kleint
|
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | | |
MingW apparently doesn't support the GDI function GetCharABCWidthsI(),
so the getGlyphBearings()-optimization is disabled for that compiler.
Reviewed-by: Friedemann Kleint
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If button contains a layout with widgets instead of having direct label
and icon, QS60Style calculates the size of the content incorrectly.
This is regression for a fix to QTBUG-7586. Now style ignores orginal
size of pushbutton and tries to calculate correct height by itself.
Issue is fixed by selecting teh bigger of orginal height and calculated
height.
Task-number: QT-3197
Reviewed-by: Alessandro Portale
|
|\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix a crash in QGtkStyle when theme not available
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
subElementRect failed to verify that the theme was
resolved before accessing certain data structures.
Reviewed-by: ogoffart
Task-number: QTBUG-9240
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It was missing and not covered by the standard autotests, so its
missing was not detected for quite some time.
Task-number: QTBUG-8423
Reviewed-By: Shane Kearns
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed crash in Phonon MMF backend during application shutdown
Fixed bitfield-related crash on Symbian WINSCW
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When running on WINSCW, the nativePaintMode variable was becoming
corrupted. The point at which this corruption occurs is unclear,
but it can be reproduced as follows:
1. Launch qmediaplayer
2. In the Phonon::MMF::DsaVideoOutput constructor, the
nativePaintMode flag is set to QWExtra::ZeroFill
3. Open a video clip
4. During start of playback, QSymbianControl::Draw is called on the
native control corresponding to the DsaVideoOutput object. This
checks the value of nativePaintMode; it does not match any of
the valid NativePaintMode values, so an assertion fails.
This crash does not occur on target, suggesting that the cause may
be an error in the WINSCW compiler. Although the C++ standard allows
bitfields to have boolean, integral or enumeration type, the latter
is not permitted by C99.
Neither increasing the number of bits allocated to nativePaintMode,
nor changing it position in the list of platform-specific bitfields
has any effect.
After making nativePaintMode into a normal field rather than a
bitfield, the crash no longer happens. Note that, since bitfields
must be kept together, nativePaintMode is moved to the end of the
structure.
|
|/ /
| |
| |
| | |
Reviewed-by: Eskil
|
|\ \
| |/ |
|