| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
| |
7ef45318255c5cf1f10508753c9a2c55fc2cb8c0
321bd8b7b54e34a983b1ba142af836cf3e153a66
(cherry picked from commit c16f0a839743af36b36aea9c35f0d5ddfda3d6ac)
|
|
|
|
|
| |
f17d8a5dbef076046ff504fecb1fd445c9b785ac
(cherry picked from commit 0664d3ad029b4d80d9ffac75f4f1c6c47bac2641)
|
|
|
|
|
| |
426ff79e49d4abb659167541bb67846443b9707e
(cherry picked from commit a0ae434a452deea022e3b7117e946e95542aa884)
|
|
|
|
|
|
|
|
| |
This reverts commit 453abe70fec02456aba2219025f5202060eaece1.
Task-number: QT-3583
Reviewed-by: Jason McDonald
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
| |
Task-number: QTBUG-12397
(cherry picked from commit 3e8597ff6029d33d629191370d9fed7d37d3962a)
|
|
|
|
| |
(cherry picked from commit 430243688f6cc84da496c3369bfeb1a8685f1016)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
| |
Reviewed-by: Joona Petrell
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The problem happened because of a race condition in the way Qt
cancelled the select call from Open C. Under high network loads, a
network request could come in, causing the select call to end.
Afterwards, the pipe normally used to cancel the select call would
be emptied (although it was already empty). If a context switch
happened after the pipe was emptied, but before the lock was released
in waitCond.wait(), the main thread could try to grab the lock and
write to the pipe because it was unsuccessful. This would in turn
cause the next call to select to terminate immediately, and without
work to do, the select thread would go straight down to
waitCond.wait() and get stuck there.
Fixed by moving the pipe draining loop from the select thread to the
main thread, right after the lock grab. This guarantees that the
select thread is empty when returning to the select call.
Task: QT-3358
AutoTest: Passed
RevBy: Markus Goetz
(cherry picked from commit 61daa2f419696881ccdbc1cde2dc197eaf028ff6)
|
|
|
|
|
|
| |
Task: QT-3358
RevBy: Markus Goetz
(cherry picked from commit c042003a831ace1ffe4cc399668293200ffe829f)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I haven't seen the bug happening in practice, but I decided to be
safe rather than sorry.
The rationale is that if a network request comes in, the select
thread will signal the active object in the main thread, remove the
socket from the set of monitored sockets, and then go to sleep in the
waitCond.wait() call, waiting for reactivation by the
QSelectMutexGrabber. However, in
QEventDispatcherSymbian::socketFired(), if the event causes the
socket to be deleted, reactivateSocketNotifier will never be called,
and therefore the wait condition will never be terminated.
Fixed by only entering the wait condition if a grabber has already
written to the pipe, signalling that it wants the lock.
AutoTest: Passed
RevBy: Markus Goetz
(cherry picked from commit fc260f7ce9c139da93e005b2b51ef37c4d23998d)
|
|
|
|
| |
Reviewed-by: MArtin Jones
|
|
|
|
|
|
|
|
|
| |
This is more or less the same as in the
QGLFramebufferObject::bind()/release() case.
Task-number: QTBUG-12319
Reviewed-by: Kim
(cherry picked from commit 3a08c5b1682e211bf664c21850187e2b15e89c23)
|
|
|
|
|
|
|
| |
Task-number: QTBUG-12266
Merge-request: 752
Reviewed-by: Trond
(cherry picked from commit d6203cfeb0e096575c1fc0254dddc07a3d65d24c)
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
| |
Broke signal handlers in QML
Task-number: QTBUG-12335
Reviewed-by: Aaron Kennedy
(cherry picked from commit ddb5e1eef379c7f32a594d91b00ff3514c46b62a)
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
|
| |
Ancestors of the item with focus should only report wantsFocus as true
when they are a FocusScope or a top-level item.
Reviewed-by: Aaron Kennedy
Reviewed-by: Yann Bodson
(cherry picked from commit 686fca1c78e6d4d2ba597dd75d982c76647c7707)
|
|
|
|
|
|
|
|
|
| |
This allows dragging a MouseArea that contains a clickable MouseArea,
for example.
Task-number: QTBUG-12323
Reviewed-by: Michael Brasser
(cherry picked from commit 5dd0dfcd7a079065f99c6149c15b58e69f302729)
|
|
|
|
| |
(cherry picked from commit b325c90e5a0e5088aa8723d943f4c38b14048bd7)
|
|
|
|
|
| |
Seems some platforms don't have it.
(cherry picked from commit 7725da34a828df00feb289515c11fa8aea1a55d8)
|
|
|
|
|
|
|
|
|
|
|
| |
Allow essentially unbounded dragging once drag.target is set. The previous
default of contraining the dragging to 0,0 (i.e. no drag) was unintuitive
for learners. It's rare that unbounded is actually what you want, but it
makes it much easier to get started with the element.
Task-number: QTBUG-11184
Reviewed-by: Martin Jones
(cherry picked from commit b2f90dedbeac285338af07fbffaec97ceaf0876f)
|
|
|
|
| |
(cherry picked from commit 07ebc9161263c04dc072b9fc2a922b9665cbe7be)
|
|
|
|
|
|
|
|
|
|
|
| |
Otherwise a Behavior may mistakenly not be triggered. This situation
can arise when the property in question has been manipulated via the
property system, followed by a direct function call (which correctly
bypasses the Behavior), followed by a another change via the property
system.
Task-number: QTBUG-12295
(cherry picked from commit 64833c0a648211f3fe7547436f022edc0ceb51ac)
|
|
|
|
|
|
|
|
|
| |
The boundingRect depended upon the image cache which may not become
valid until after boundingRect is called.
Task-number: QTBUG-12291
Reviewed-by: Michael Brasser
(cherry picked from commit 3aeafb4839f49f524f10eae65be27fd189d37060)
|
|
|
|
|
|
|
|
| |
We need to create our cached image in boundingRect() if it doesn't
already exist, to prevents painting errors.
Reviewed-by: Warwick Allison
(cherry picked from commit 6c3cf7e2c5868bc77ffa66059889eda3132531b3)
|
|
|
|
|
|
|
|
| |
having different contents
Task-number: QTBUG-12339
Reviewed-by: Martin Jones
(cherry picked from commit 0767c2ff719a35c16c72fac97e6ff612e8c71e21)
|
|
|
|
|
|
| |
Task-number: QTBUG-12322
Reviewed-by: Aaron Kennedy
(cherry picked from commit 0b83a2161261be525f01359397ab1c8c34827749)
|
|
|
|
|
|
|
|
| |
... and percentage is useless.
Task-number: QTBUG-12282
Reviewed-by: Warwick Allison
(cherry picked from commit 78a01438e5a37fd1778924f73ca8bfa55960b0d0)
|
|
|
|
|
|
|
|
| |
height explicit
Task-number: QTBUG-12273
Reviewed-by: Michael Brasser
(cherry picked from commit 164b2b54922d87a44a60efe6dbbe2fa3b7716820)
|
|
|
|
|
|
|
|
|
| |
transformOriginPoint is undocumented for a reason. It shouldn't be used
by Item. Added some docs to assist find the right way, i.e. Scale and
Rotation elements.
Task-number: QTBUG-12265
(cherry picked from commit 06ef198e0812b514c261ef8f7c82db754450f1fa)
|
|
|
|
|
|
|
|
|
|
| |
Using this property on Item will break transformOrigin property. We
have never documented it. It should not have been used. Now it is
enforced as best we can.
Task-number: QTBUG-12265
Reviewed-by: Aaron Kennedy
(cherry picked from commit 7fb140b63f03b96064ded4ec6f2ec7c93e87b825)
|
|
|
|
|
|
|
| |
Also parent them back to the VIM to ensure correct destruction.
Task-number: QTBUG-12261
(cherry picked from commit 17cc89e918a969d85d2b46631ee8743288c7586d)
|
|
|
|
|
| |
Task-number: QTBUG-12132
(cherry picked from commit d9f5b8742f84124c3c0e2bdbd7b860dce2bc2225)
|
|
|
|
| |
This reverts commit 8932980a72653aa9695a6d0f1c8ce6077506d33c.
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
| |
Task-number: QTBUG-11512
(cherry picked from commit d8908922f339892fee4275a433e2bf6da87ae055)
|
|
|
|
| |
(cherry picked from commit e0a102ee171ddcebb1104d98d8a4ff4993e91c1d)
|
|
|
|
|
|
| |
Task: QTBUG-11927
RevBy: Trust me
(cherry picked from commit 77bd18e7636a65c3a3be5e8e912484e8dc5fee02)
|
|
|
|
|
|
|
|
|
| |
Since we cannot extract to the epocroot (it is considered R/O), we
extract the header and the dso to the temporary build directories and
include them from there.
RevBy: Trust me
(cherry picked from commit c578c6c1d6dc2f3bb6cc53abb8da2e706a249f02)
|
|
|
|
|
|
|
|
|
| |
The problem was that the QT_BEGIN_NAMESPACE was in the wrong place.
I moved it 10 lines before and the problem is gone.
Task-number: QTBUG-12262
Reviewed-by: Prasanth
(cherry picked from commit b0998a44a5dc384a6cf65c1d5910cb3dd40620cf)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The way we detect the end of a default argument does not take in account
template parametter.
It is unfortunatelly not trivial to do it properly without semantic information
So we will use heuristics and if the number of < matches the number of >
we consider it is a template. Or if we have a '=' we consider it is not a
template.
Task-number: QTBUG-12260
Reviewed-by: Roberto Raggi
(cherry picked from commit 4da1a3b63445c04d4ca4acae448e9b6b046938c3)
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
|
|
| |
If Oracle national char types use different charset(NLS_NCHAR_CHARSET) with
the database charset (NLS_CHARSET), the oci client need to set OCI_ATTR_CHARSET_FORM
to SQLCS_NCHAR instead of SQLCS_IMPLICIT.
Task-number: QTBUG-10919
Reviewed-by: Michael Goddard
(cherry picked from commit f8f255553f3640355d3e196e100778256741701c)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The reason for the infinite recursion was that
QAccessibleTitleBar::object() returned the titlebar's dockwidget.
This could lead to a problem when the AT client tried to
traverse the accessibility hierarchy:
As a response to QAXChildrenAttribute (retrieve children) on a dock
widget node, it would register it's children in the
hierarchy manager. In this case, the object registered for the titlebar
interface was the QDockWidget.
In order to do further traversal, the bridge could call
queryAccessibleInterface on the list of retrieved children to get the
QAccessibleInterface for those objects, however, that would return the
QAccessibleDockWidget interface that we just had traversed,....
Task-number: QTBUG-6843
Reviewed-by: Carlos Manuel Duclos Vergara
(cherry picked from commit 64b9e63f4f9162c1af299b1355e84b0e616ad768)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|