| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed drawImage() not to attempt drawing null images on openvg.
QS60Style: Update placeholder texture to real one
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Once the background texture has been created, update it to all widgets.
This corrects most cases where texture is used outside of QS60Style.
It is still possible to access the placeholder texture and draw it,
if:
a) QPalette::Window is accessed before drawing even one widget
b) Painting the texture happens without using QS60Style
Task-number: QTBUG-14910
Reviewed-by: Laszlo Agocs
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Don't crash calling QTextDocument::blockBoundingRect on invalid block
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If the block is invalid, QTextBlock::layout() will return 0 and we would
dereference a null pointer.
Task-number: QTBUG-18192
Reviewed-by: Jiang Jiang
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Change the pooled QGLPixmapData to be backed by QVolatileImage.
Started changes-4.7.4 file
Changed s60 style not to rely on QPixmapData::toNativeType().
Add missing bitmap locking to QVGPixmapData::fromNativeType.
Prepare fromSymbianCFbsBitmap autotest for 16 bpp format.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Forcing VG (and GL) pixmapdata to support toNativeType() with type
VolatileImage is unnecessary. It is cleaner to try doing a
fromNativeType() with bitmap+mask and fall back if that results in
a null pixmapdata.
Reviewed-by: Jani Hautakangas
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add flag for forcibly propagating backing store alpha to framebuffer
Fixed unmatched quotes in s60installs.pro
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previously, the following rules applies to the creation and blitting of
the Symbian raster backing store:
1. Creation of backing store with an alpha channel:
Backing store has an alpha channel only if !QWidget::isOpaque.
2. Pre-filling of backing store prior to paint loop:
Backing store is filled with transparent pixels if
!QWidget::isOpaque.
3. Blitting of backing store:
CGraphicsContext::EDrawModeWriteAlpha is used (meaning that backing
store alpha values are propagated into the frame buffer), if
QWidget::isOpaque.
In order for the direct camera viewfinder to be visible on DSA devices,
alpha=0 must be written into the framebuffer in the region where the
viewfinder will be displayed. This requires a backing store with an alpha
channel (1), use of CGraphicsContext::EDrawModeWriteAlpha (3), but not
pre-filling of the entire backing store (2).
This patch adds a new enum value, QWExtra::BlitWriteAlpha, which can be
used by camera backends to achieve the desired behaviour.
Task-number: QTMOBILITY-1278
Reviewed-by: Jani Hautakangas
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Changes to driver workarounds.
Switch to raster also when last window is destroyed (on MeeGo).
Clipboard/Windows: Fix a hang when sending to non-responsive clients.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Check if clipboard viewer is responsive before sending the
contents. This prevents Qt Creator from hanging when copying
text while a debugging session with a crashed/stopped
debuggee is in progress.
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
Task-number: QTBUG-17465
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Introduce QGraphicsItem::ItemStopsFocusHandling flag
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When set for an item, QGraphicsScene will skip focus handling for this item and
everything underneath it (including focus-out). Allows users to reimplement
custom focus handling.
Use case: touch devices that implement panning. Here, focus-in has to happen
only if no panning was triggered. Analogous, no focus-out should happen when
panning was detected.
Fixes the alternative proposal ("black holes for focus changes") of
QTBUG-16343: QGraphicsView doesn't support focus change on mouse release.
The previous test was only testing one scenario, which didn't give a good idea
whether the flag was actually working as intended.
Task-number: QTBUG-17505
Reviewed-by: Yoann Lopes
Reviewed-by: Jan-Arve Sæther
|
| |\ \ \ \ \
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix for wrong dpi metrics for raster pixmaps on Symbian.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The original implementation relied on SizeInTwips() for the underlying
bitmap which unfortunately returns 0, leading to incorrect results
from QPixmap::logicalDpiX/Y(). This caused issues in text rendering
onto pixmaps (QTBUG-17628). This fix changes QS60PixmapData to use a
slightly different metrics() implementation (the one VG and GL
PixmapData are using).
Task-number: QTBUG-18154
Reviewed-by: Jani Hautakangas
|
| |\ \ \ \ \
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QMeeGoLivePixmapData : when creating QImage, use constructor with pitch.
Added automatic graphicssystem switching on meego when app is minimized.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When all top-level widgets are minimized we switch to raster to reduce
GPU memory consumption. We switch back to graphicssystem meego when at
least one top-level widget is shown normally again. The switching only
applies when the runtime graphicssystem is being used. The switching
only applies when the runtime graphicssystem is being used.
Task-number: QTBUG-18013
Reviewed-by: Armin Berres
|
| |\ \ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Hot fix for compilation without QGL_USE_TEXTURE_POOL
Initial implementation of GLES2.0 resource pooling
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Keep the implementation in separate
qpixmapdata_poolgl.cpp file until the pooling has
been verified and confirmed to work ok.
Task-number: QTBUG-15253 QTBUG-17850
Reviewed-by: Samuel Rødal
|
| |\ \ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Designer: Fix a bug affecting tab reordering of promoted tab widgets.
Designer: Fix a bug clearing the Z-Order when adding a new widget.
Adjust right bearing when breaking with line separators
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If we found a forced line break with line separator (e.g. '\n'),
take the right bearing of previous glyph into account, otherwise
the resulting text width will be slightly smaller than the one
without a line separator.
Task-number: QTBUG-17020
Reviewed-by: Eskil
|
| |\ \ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (46 commits)
Fix the license info for bin/elf2e32_qtwrapper.pl.
Avoid panics in QDesktopWidget on Symbian emulator.
QS60Style: use placeholder texture when polishing widgets and palette
Regression: QS60Style: Theme background is incorrect
Remove changes from fix to QTBUG-17045 that were not related to the fix
Prevent null pointer crash when closing splitview
QS60Style slows down layout switch by updating widgets unnecessarily
Fix qgraphicstransform autotest for Symbian, where qreal is float.
Removed reference to nonexistant profile.
Disable capabilities example for symbian-gcce due to a bug in elf2e32
Readded a ';;' that was removed by mistake.
Fixed mkspec detection for Symbian.
Removed javascript-jit from default symbian-gcce build.
Corrected a mismerge in GCCE link parameters.
Fixed incorrect referral to an include file.
Fixed win32-msvc2008 build regression.
Made qmake strip trailing \ from libdirs.
Fixed GCCE libdir handling if the paths have spaces in them.
Added MinGW support for adding lib prefix and extension via profile.
Added support for various special compiler/linker flags on MinGW.
...
|
| | |\ \ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
There is usually only one screen on the emulator and it was incorrectly
assumed that ScreenDevice() would return null for a non-existing
screen. It panics instead so the entire call must be skipped.
Reviewed-by: Sami Merila
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Background texture is not created until it is actually painted.
This allows skipping the whole background texture creation, if app
overwrites the QPalette::Window with its own data (image or color).
When widget is drawn and style notices that the widget is still using a
placeholder (1*1 red QPixmap) texture, it creates the real texture and
uses that for drawing.
Note that accessing QPalette::Window will give the placeholder pixmap.
Which is then again replaced with the real texture, if it is drawn
through the qt_s60_fill_background().
Task-number: QTBUG-14910
Reviewed-by: Laszlo Agocs
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix for QTBUG-16816 cause theme background to display incorrectly
after a layout switch is done. Theme background is shown "tiled"
instead of being whole screen size.
This is because the setBackgroundTexture() call was removed to "save"
QPixmap creation. Unfortunately, it really skips the background
texture creation, but does not re-create a new one for the new layout,
so portrait background is used again. This leads to tiling the image.
Let's just return the call to the setBackgroundTexture()
(this will eventually anyway be "optimized" with fix for QTBUG-14910).
Task-number: QTBUG-17930
Reviewed-by: Laszlo Agocs
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
There were changes included in the fix for QTBUG-17045 that were not
supposed to be part of that fix. These changes to qcombobox.cpp are
now removed.
Task-number: QTBUG-17045
Reviewed-by: TrustMe
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Prevents crash when focus item is not set and splitview is closed.
This is partial fix to QTBUG-17045.
Task-number: QTBUG-17045
Reviewed-by: Guoqing Zhang
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Remove refreshUi() method frmo QS60Style. It might have been necessary
two years ago, when we didn't have proper polishing of QWidgets
(when style changed), but it is no longer needed.
It just slows down orientation switch.
Task-number: QTBUG-17840
Reviewed-by: Tomi Vihria
|
| |\ \ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Prevented infinite recursion in QPainterPath::contains().
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Limit the amount of recursions in qt_painterpath_isect_curve to prevent
a crash.
Task-number: QTBUG-16422
Reviewed-by: Kim
|
| |\ \ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style: QTreeView::indexRowSizeHint returns incorrect value
|
| | |\ \ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Fix for http://bugreports.qt.nokia.com/browse/QTBUG-17786.
QS60Style tries to work around the hardcoded margin that the
QCommonStyle adds to menu items (line 4782 in my QCommonStyle.cpp).
Unfortunately regular itemview items are handled in the same code
branch in QS60Style, so the class incorrectly reduces the itemview
height 8 pixels. The reduction should only happen with menu items.
Task-number: QTBUG-17786
Reviewed-by: Laszlo Agocs
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix TextEdit mouseSelectionMode overriding selectByMouse.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
If selectByMouse is false don't allow any text selection on mouse
move.
Change-Id: Ic9f309899bc0de48066a2393e088e15b3a2f06db
Task-number: QTBUG-18072
Reviewed-by: Martin Jones
|
| |\ \ \ \ \ \ \
| |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Update QML "What's New" docs.
Don't reveal TextInput text on refocus in PasswordEchoOnEdit mode.
Fix ListView boundary extents for RTL layout.
Fix compiler warning.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
In PasswordEchoOnEdit mode return the display text instead of the
real text from inputMethodQuery() when not editing the password and
clear old password if new input is received through an input method
event.
Change-Id: I7f24f510bf8e356e460900c3b9ff55ea16b32ab3
Task-number: QTBUG-17562
Reviewed-by: Joona Petrell
|
| |\ \ \ \ \ \ \
| | |_|/ / / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix for major regression in OpenVG clipping
Cast int to HALData::TAttribute for QT_HALData_ENumCpus and compile with RVCT4.
Don't use EGL surfaces for translucency with 32MB GPU chip.
Fix for fromSymbianCFbsBitmap changing the source data unexpectedly.
Background app visible after split view closed
Get the number of cores from HAL on Symbian.
Avoid image conversion in fromSymbianCFbsBitmap for certain formats.
Polish splitview implementation
QML app: text input field is not visible when split view is opened
Visible flashing on QML app when split view is opened and closed
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Add dynamic GPU chip detection on Symbian to decide if
translucent EGL surfaces can be used. With 32MB GPU memory
there is not enough memory to create for example transparent
video overlay widgets and that's why hw surfaces must not
be used.
Task-number: QTBUG-18024
Reviewed-by: Jason Barron
|
| | | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Inverting the pixels for bitmaps of mode EGray2 is done in-place,
which is wrong if the bitmap handle was duplicated. Instead, we
need to make a copy. This also means that we cannot treat EGray2
a conversion-less format in openvg, but such images are likely
to be used as masks only, so optimizing just for mere drawing
in case of this format is not really necessary.
Reviewed-by: Jani Hautakangas
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When using an app with graphicsview + vertical scrollbar that has
previously opened the splitview, when closing the keyboard, the
application is not reset to the original geometry correctly.
This is caused by invalid operation in the resetSplitView() method
that does not resize the graphics view back to original size AND
might even leave it with incorrect window state.
Task-number: QTBUG-17937
Reviewed-by: Guoqing Zhang
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
From now on the image data coming from CFbsBitmap will not be forced
to RGB32 or ARGB32_Premultiplied in openvg. This allows copy-less
creation and drawing of pixmaps not just from bitmaps with display mode
EColor16MAP and EColor16MU, but also a few other modes, like EColor64K.
Painting into such pixmaps or drawing them via the raster engine is
potentially slower in such cases, which is now reflected in the
fromSymbianCFbsBitmap documentation.
Note that this patch has no effect on extended bitmaps (e.g. skin
graphics), those must always be rasterized first regardless of the
display mode.
Task-number: QTBUG-18027
Reviewed-by: Jani Hautakangas
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Remove calls to unnecessary methods.
Remove unnecessary checks.
Fix whitespace.
Reviewed-by: Laszlo Agocs
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When using a maximized QML application and user taps to a input widget,
opened splitview does not show the focused input widget.
The root cause of the problem is that when we move to splitview, we
set the window state to fullscreen. Unfortunately, there we were
trying to fullscreen the input widget and not the window that where
the input widget is.
Task-number: QTBUG-17984
Reviewed-by: Guoqing Zhang
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The root cause is that input widget is re-positioned twice;
once when keyboard opens and second time when window becomes visible.
This causes flicker.
Task-number: QTBUG-17979
Reviewed-by: Laszlo Agocs
|
| |\ \ \ \ \ \
| | |_|/ / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix QGraphicsScene returning incorrect focus item.
Not requiring valid QTextBlock in previous()
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When the scene was losing and regaining focus, it was incorrectly
setting the focus on any item that had its focus previously explicitly
cleared.
Autotest included.
Task-number: QTBUG-16401
Reviewed-by: TrustMe
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Commit 64852122ba7 introduced a regression in QTextBlock::previous(),
programs that do doc.end().previous() will not be able to retrieve
the last valid block. Revert this change so that we can keep the
behavior consistent with previous versions.
Task-number: QTBUG-18026
Reviewed-by: Eskil
|
| |\ \ \ \ \ \
| | |_|/ / /
| |/| | | /
| |_|_|_|/
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (27 commits)
AnimatedImage does not change progress value
Fix failing tests
Fix line information for dynamic slots in .qml files
Add missing header include missing from the previous commit
Fix horizontal alignment of QTextDocument-based RTL text
The rotation reported by PinchArea should not be in the range -180..180
Revert to previous lineHeight behavior.
Use the text layout bounds calculated by QLayout.
Fix TextInput key navigation for RTL text
Base empty QML editor horizontal alignment on QApplication::keyboardInputDirection()
Include dynamic parenting use cases in layout mirroring autotests
PinchArea example produced incorrect scaling.
Fix documentation talking about old property LayoutMirror::mirror
Reverse horizontal alignment of QML editors when the layout mirroring is enabled
Update QtDeclarative def files
Removal of text alignment layout direction dependency was missing couple of changes
Fix RTL multiline Text drawing
Remove text alignment of empty QML editors following the layout direction
Add a way to query the reading direction of QML editor text
Make sure horizontal QML editor text aligment always returns the actual alignment
...
|
