| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
| |
(cherry picked from commit 30d6f7ed29a2a5723387768cfe82a807a2724b8b)
|
|
|
|
| |
(cherry picked from commit fb6aa3b0769c33685ad38a13fe5ad0ca48679a93)
|
|
|
|
|
|
|
|
|
| |
validating and adding some french translations.
Plus all the fixes from Gabriel's extensive review.
Doc: Fix a typo
Reviewed-by: gabi
(cherry picked from commit 209c017333fea9827fd20c7f8d23721bd8a6ee43)
|
|
|
|
|
|
|
|
|
| |
If the item is removed from the scene in response to the FocusOut event
of the previous item don't continue attempting to set focus.
Task-number: QTBUG-12620
Reviewed-by: Michael Brasser
(cherry picked from commit 7f2c9d716cba375ee3e576513898a39b3f2c39a5)
|
|
|
|
|
|
|
|
|
|
|
| |
The problem is that the qt_arcs... function will return point_count = 0
when the input rectangle is empty which it is in this case. Because we
previously passed 13 there, were passing random memory to downwards in
the pipeline, which caused problems.
Task: http://bugreports.qt.nokia.com/browse/QTBUG-12516
Reviewed-by: mariusso
(cherry picked from commit 08d09a78d3faf8b211e78cb63285c35c5544b5fc)
|
|
|
|
|
|
|
|
|
|
|
| |
Qt has a run-time assert for implementing drawPolygon() in any subclass
of QPaintEngine, which will be hit if set font decorations on the font
used by QStaticText. Since we don't care about line decorations or any
other shapes drawn in the QTextLayout, we simply leave the
implementation empty.
Reviewed-by: Gunnar
(cherry picked from commit 43f37074391b338b250883dfeb4a16844ca759fd)
|
|
|
|
|
|
|
|
|
|
|
| |
The temporary cursor position was not being updated after committing the
input (changing the cleartext into a *), as a result of which, the next
keypress was mistaken for a multitap input which should replace the last
character.
Task-number: QTBUG-11673
Reviewed-by: axis
(cherry picked from commit 7acf2417bd2ae17c2e3c289c7caed84219e5fecd)
|
|
|
|
|
|
|
|
|
|
| |
In some cases the NSKeyDown event won't have fully constructed string
in the [NSEvent characters]. So we need to add a guard before accessing
the elements of this NSString.
Task-number: QTBUG-12474
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 307601da8d3b64de7b7d83a6de0b5dac290b0eb6)
|
|
|
|
|
|
|
|
|
|
| |
Our stringToCMap implementation for CoreText that bypasses the shaping needs
to have basic support for font cascading / glyph substitution. We now use
CTFontCreateForString to determine the substitute font for missing glyphs.
Task-number: QTBUG-12411
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
(cherry picked from commit 00fb79714162ea3e434cf66a87a70a4fc26b2b86)
|
|
|
|
|
|
|
|
|
|
|
|
| |
If a window has several child windows, it was not be possible to
click on a child window to make it stack in front of the other
children. The reason is that cocoa held a fixed stacking order of
the child windows (sub-windows). This patch will release, and then
reestablish, the stacking order of the children upon acitvation.
Task-number: QTBUG-11780
Reviewed-by: prasanth
(cherry picked from commit 44e11692549f1d6a4fed01066a06085dacfaa444)
|
|
|
|
|
|
|
|
|
|
|
|
| |
If this is not done, later deletion of the backing store may cause
a crash. If the backing store is an EGL surface, its destruction
includes a call to eglDestroySurface(), which triggers an exception
if the window handle passed as a parameter is no longer valid.
Task-number: QTBUG-10643
Task-number: QTBUG-11376
Reviewed-by: Jason Barron
(cherry picked from commit cc3c416682791e1a2fd61d9a473ba3b4715c502d)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
On the X11 paint engine, when rendering lines with float coordinates,
the lines were one pixel off if the decimal was > 0.5.
This fixes the WebKit bug https://bugs.webkit.org/show_bug.cgi?id=42248
Autotest by Yoann Lopes.
Reviewed-by: Simon Hausmann
Reviewed-by: Yoann Lopes
Reviewed-by: Andreas Kling
(cherry picked from commit ebbab30af417dfbf3df47dec15c0e2f8d6a30fa6)
|
|
|
|
|
|
|
|
|
| |
We were making the wrong assumption that the selectedFilter string
will be valid always, when calling functions like getSaveFileName().
Task-number: QTBUG-12461
Reviewed-by: Denis
(cherry picked from commit fb47a99e1d0020e8dcc4cc4f9c188ccd2fd5ee3e)
|
|
|
|
|
|
|
|
|
|
| |
Sharing a NOTIFY signal can cause binding loop warnings with no apparent
cause.
Task-number: QTBUG-12333
Reviewed-by: Aaron Kennedy
Reviewed-by: Michael Brasser
(cherry picked from commit 5d5feaa86f3933a1e89b53267953b86e2b0459ed)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
After looking at QTBUG-11338 and Qt's behavior, it became clear that
we needed more state tracking in the key event handling code, to be
able to handle all the different ways that we can get key events.
This inspired having three states for each used scan code, instead of
the old code, which only took the current scan code into account.
This should make Symbian behave identically to Linux.
Task: QTBUG-11338
AutoTest: N/A, platform specific code. There was lots of manual
testing on 5800, N97 and N95.
RevBy: Jason Barron
(cherry picked from commit 041570ca54824ee358593f112b38e26632c3ebbf)
|
|
|
|
| |
(cherry picked from commit 5a3246b198ced3634bd974919e78310d536be27e)
|
|
|
|
|
| |
RevBy: Trust me
(cherry picked from commit 998ba966215482048f7fa93908212b1ee4a0c357)
|
|
|
|
|
|
| |
QTBUG-11938 and QTBUG-10801
(cherry picked from commit 5bdb85e3b21bcf624eb1830aa32d027e0c6870fe)
|
|
|
|
|
|
|
|
|
| |
The native border would be drawn over the one drawn by the QStyleSheetStyle
Regression since 68a498284e206e2bb000bc35331c966f3790f607
Reviewed-by: Gabriel
Task-number: QTBUG-10785
(cherry picked from commit 0318f0d5a43a78831f3bf4cb043d0b2b41cd9987)
|
|
|
|
|
|
|
|
|
|
|
| |
It used to fix an issue during logout but it
seems to be fine now.
Related issue: QTBUG-6296
Task-number: QTBUG-10993
Reviewed-by: Morten Sorvig
(cherry picked from commit 4942890f85e5fa74bf8c37cf7f53f6f3eaf40596)
|
|
|
|
|
|
|
|
|
| |
This fixes a crash when a static QWidget is destroyed after the QApplication
object.
Task-number: QTBUG-12025
Reviewed-by: Zeno Albisser
(cherry picked from commit 475a3c275ba173cb130a838b6053cb45d405887e)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QDesktopWidget on Symbian was not properly emitting the resized() and
the workAreaResized() signals. Qt was properly translating the system
event and sending the QResizeEvent to the widget, but the signal
emission is determined solely based on changes in the QVectors of
QRects outlining the screen dimensions. On Symbian, these vectors were
never being set and as a result the signals were never omitted.
The fix is to set the rects correctly in the init() function which is
called by the resizeEvent() handler. Also modify the accessor functions
to return the rectangles stored in the vector instead of querying for
them each time.
Task-number: QTBUG-11433
Reviewed-by: axis
Autotest: PASSES
(cherry picked from commit 61908af46700c7c1f2e59ce98daeadc2529fef1b)
|
|
|
|
|
|
|
|
|
| |
This commit also updates QPalette's documentation regarding the current
ColorGroup and operator==.
Task-number: QTBUG-697
Reviewed-by: ogoffart
(cherry picked from commit 24cdab32de2abd8669f281dd54c8da1124514915)
|
|
|
|
|
|
|
|
|
|
| |
The wantsFocus property has been renamed to activeFocus, to better
reflect its value. Reading and writing the focus property is also now
consistent -- this property represents focus within a scope. Other small
changes were made to keep things consistent with the new naming.
Reviewed-by: Aaron Kennedy
(cherry picked from commit 21806ff0921641b4e4d9d39721ab4ebeae74dddc)
|
|
|
|
|
| |
Task-number: QTBUG-12132
(cherry picked from commit d9f5b8742f84124c3c0e2bdbd7b860dce2bc2225)
|
|
|
|
|
|
|
|
|
|
| |
While generating the QDragMoveEvent, we were always reusing the last
drop action set by the user. This is not correct, we should copy the action
only if a valid action set before. This is the behavior on Windows.
Task-number: QTBUG-9486
Reviewed-by: Denis
(cherry picked from commit 88410105978d5fb4344207cd5d296057ced0f27d)
|
|
|
|
|
|
|
|
|
| |
QTextBlock::layoutDirection() doesn't exist, and the QStaticText
constructor no longer takes a size argument.
Task-number: QTBUG-12072
Reviewed-by: Fabien Freling
(cherry picked from commit 04bc2b1f37750a2afbb88521001758249a8df383)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This only happens when the ItemHasNoContents and ItemClipsChildrenToShape
flags are set. Problem is that items with no content are threated as 'dummy'
items, which means they are never drawn or 'processed' otherwise, so the
cached bounding rect is not reliable/usable. This means that in case of
changing the geometry of such items, its children always have to take
care of invalidating the occupied areas and the update can not be
clipped to the item's bounding rect.
Regression after commit: c1c7dbf2
Auto test included.
Task-number: QTBUG-11504
Reviewed-by: yoann
(cherry picked from commit 4df9c96e2c213c39924e22e02621b0c61e83f8fe)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QSymbianBitmapDataAccess is used to provide access to the bitmap heap
in a manner that locks correctly on all platform versions. The
heapWasLocked variable was meant to protect against the case where
the heap is locked recursively. However, it failed to take into
account the case where the same QSymbianBitmapDataAccess object was
used to lock recursively. In this case the variable would be changed
to true on the second lock, which means that the lock would never be
released again.
This was fixed by making the access reference counted instead. Since
the bitmap heap lock is global, the refcount was made global as well.
Task: QTBUG-11129
RevBy: Jason Barron
AutoTest: Works again. It was hanging before this fix.
(cherry picked from commit d4cc1dcea5b4116767cfee0ec45bfba72dc011ff)
|
|
|
|
|
|
|
|
|
| |
When the sections were moved calling logicalIndex on what was already
a logical index messed up the hidden sections.
Task-number: QTBUG-12268
Reviewed-by: Gabriel
(cherry picked from commit 8517f787b798d9e300438404aab359de2acc0978)
|
|
|
|
|
|
|
|
|
|
| |
When calling showNormal on a window that was maximized, we must remove
the [X] button from the task bar. But only if it was added by
qt_wince_maximize.
Task-number: QTBUG-8408
Reviewed-by: Martin Petersson
(cherry picked from commit ad4aff6e2d188d88a2c6b4b692932adb08491d22)
|
|
|
|
|
|
|
|
|
|
|
|
| |
The [X] or cancel button in the task bar shall just "minimize" the
widget on Windows mobile. A press on this button results in a
WM_COMMAND, IDCANCEL message. Before this patch we just sent a
QCloseEvent to the widget, which had basically no effect.
Now, we're calling showMinimzed(), which is the desired behaviour.
Task-number: QTBUG-8408
Reviewed-by: Martin Petersson
(cherry picked from commit 2c1aafa47b8915ea8aae8da229d65086e42543b3)
|
|
|
|
|
|
|
|
|
|
| |
We're now showing the cancel button explicitly in the taskbar on
maximize, if the widget does not have the widget flags
CancelButtonHint and OKButtonHint.
Task-number: QTBUG-8408
Reviewed-by: Martin Petersson
(cherry picked from commit 5f76c2b168ded91835d5d161b738a5dc03556cf6)
|
|
|
|
|
|
|
|
|
|
|
|
| |
compilation with QT_NO_DEBUG_STREAM
Qt in debug need to stay binary compatible with Qt in release.
See also commit cbbd7e084c7e46fd906db26b13032b8368c59093 that
introduced the problem
Task-number: QTBUG-11510
(cherry picked from commit 633349982422fec92df4ed06da5d2becf788c494)
|
|
|
|
|
| |
This reverts commit 5488e9213e1163ff7cadffd32cf8c8b94e88dbf1. A fix for
the symbian build issue causing the revert is now available.
|
|
|
|
|
| |
This reverts commit 734d4aff280f7f272a6abe8ed02fe95e2a1b4e6d, which was
not accompanied by the necessary .def file update for symbian.
|
|
|
|
|
|
|
|
|
|
| |
Previos versions of Mac OS X (< 10.6) didn't have support for such 'Not
Allowed' cursors. 10.6 introduced a new method for NSCursor called
operationNotAllowedCursor. This fix uses the new cusor on available platforms.
Task-number: QTBUG-5186
Reviewed-by: Denis
(cherry picked from commit 247e3637c41cc14d174a1170957274fb8a9400b4)
|
|
|
|
| |
(cherry picked from commit 079a4105aff9c63d4107762aec478ade9900c7c2)
|
|
|
|
|
|
|
|
|
|
| |
The problem was caused by the fragment id being inserted
in front of a cell spanning over several rows instead of
the next logical cell (or fragment_end) in the cells structure.
Task-number: QTBUG-11282
Reviewed-by: Simon Hausmann
(cherry picked from commit d3a6f124dde7732311ad9312ebf41997712fc6bb)
|
|
|
|
|
|
|
|
| |
This reverts commit b2a4c7f0142a48f60e7ec4fc5866917e3da8b7c3.
Unit test tst_qtexttable::QTBUG11282_insertBeforeMergedEnding
fails on mac and Linux, reverting for now.
(cherry picked from commit b2002d0814e18f7a50bdbf8d17c4bc1662fa70ee)
|
|
|
|
|
|
|
|
|
|
| |
The problem was caused by the fragment id being inserted
in front of a cell spanning over several rows instead of
the next logical cell (or fragment_end) in the cells structure.
Task-number: QTBUG-11282
Reviewed-by: Simon Hausmann
(cherry picked from commit b2a4c7f0142a48f60e7ec4fc5866917e3da8b7c3)
|
|
|
|
|
|
|
|
|
|
| |
This patch takes care of missing icon on Windows Vista+7.
It also updates the metrics to look more native in both
versions.
Task-number: QTBUG-9873, QTBUG-11974, QTBUG-6120
Reviewed-by: prasanth
(cherry picked from commit 54e3221555997d26d59b880e3e153f1fc979505d)
|
|
|
|
|
| |
Task-number: QTBUG-11510
(cherry picked from commit 4e2eb2945dbc3865e2901f12d663ed89e8f0dfbf)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
These classes create a new QWidget and assign it to a static pointer
which is never cleaned up. Using Q_GLOBAL_STATIC ensures that they are
deleted on library unload. This is really just a cosmetic change that
removes a leak warning - the real fix should be to find a way to not
use a new QWidget like this. It seems odd that QGraphicsLayouts, which
don't use QWidget in any other way, should depend on QWidget like this.
Task-number: QTBUG-10768
Merge-request: 741
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
(cherry picked from commit ea6a5146397b668bf535ee7249bd4262d6185234)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Crashed because tabFocusFirst could end up being a dangling pointer when
removing an item from the scene before deleting it.
When setting tabFocusFirst in fixFocusChainBeforeReparenting, we now
check that the item is in the scene. If it is not, tabFocusFirst is set
to 0.
Autotest included.
Task-number: QTBUG-12056
Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
(cherry picked from commit 7d09f690d5b4c56699092444665d1879deb86a6e)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When setting focus on an item, subfocus chain was previously updated
only for items with a common ancestor. We now make sure that this chain
is updated also for the previously focused item (possibly not sharing
any common ancestor with the newly focused item).
Autotest included.
Task-number: QTBUG-12112
Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
(cherry picked from commit b5b011a181bd187dcef5ee8f46a3ac2c5dc2e09c)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Softkeys are updated via a compressable event that is posted via the
event loop. Since these events are not delivered immediately, there is
a chance that a call to handleCommand() could happen before the
softkeys have been updated which can lead to a crash if the previous
QAction's have been deleted already since the data structure used by
QSoftKeyManager is outdated. The likeliness of this is increased by the
fact that S60 commands are normally sent from the WSERV active object
which has a higher priority than the active object used by Qt's event
loop which means commands will preempt the event loop.
The fix is to introduce a flag that keeps track of pending update
requests and if a command is received while there are outstanding
requests, force the softkeys to be updated before handling the command.
Task-number: QT-3571
Reviewed-by: axis
|
|
|
|
|
|
|
|
| |
The QTapAndHoldGestureRecognizer now can trigger also on mouse and
GraphicsSceneMouse events and all of them will cause the gesture start
event to be sent after the touch interval timed out.
Reviewed-by: Denis
|
|\
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Revert "Character spacing when drawing a QPicture to a high DPI device."
|
| |
| |
| |
| |
| |
| | |
This reverts commit d0fb8557f3fc3e7c9305662d118228ceca9df72b.
This change breaks justified text drawing in QPrintPreview, so it's
reverted for now.
|