| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | | | |
| | | | |
| | | | |
| | | | | |
(cherry picked from commit 0da501b644c0799d4e5e357b27847cb7a58583e4)
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The eclipse integration is namespaced, but it still pulled in system plugins like the oxygen style through QT_BUILD_KEY_COMPAT check in QLibraryPrivate::isPlugin()
Task: 250185
Reviewed-by: dt <qtc-committer@nokia.com>
BT: yes
(cherry picked from commit cca58cff45ea248ab9c65fd8ce088433af1c0fe0)
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
mode, the settings are stored in
HKEY_LOCAL_MACHINE\Software\WOW6432node.
Task-number: 232011
Reviewed-by: Martin Petersson <martin.petersson@trolltech.com>
(cherry picked from commit bbad83a64373b7e01f6abee98d854380f03aa6b6)
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Clip both against the source and target device rectangles.
Task-number: 247937
Reviewed-by: Trond
BT: yes
(cherry picked from commit 9da65ead69c92df717b1a63fe3c98c0cc73270f9)
|
| | | | |
| | | | |
| | | | |
| | | | | |
(cherry picked from commit 4e9c2364e8e9580aa317e9387338d45207ac4baa)
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
same.
updateBoudingRect update the item only if the boundingRect change
but if we have 123 as an initial text and then we set 321 as the new
text, then nothing happen because the rect is the same.
In case the boundingRect change then we call update 2 times but
the item is already dirty so the second call will just return.
BT:yes
Reviewed-by: Andreas
(cherry picked from commit 36b16a126e24cb8d8e5c34cfd807bc7c51ea49cf)
|
| | | | |
| | | | |
| | | | |
| | | | | |
(cherry picked from commit 4cb80de7ade662deb5542f77cd3a36517fa9cd9b)
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Mac/Cocoa.
Check if the view is visible before attaching it to a context.
Task-number: related to 250066
Reviewed-by: Norwegian Rock Cat
BT: yes
(cherry picked from commit b646787cf0d67f4df00212f62a83432c641eae95)
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
It worked in 4.5.0, so it should work in 4.5.1 too.
(cherry picked from commit d7e8586e6ab009a6da1eb63aa6798d7c6a34c30d)
|
| | | | |
| | | | |
| | | | |
| | | | | |
(cherry picked from commit 869c85e2f965a226416f0a142572ff749b30ba9e)
|
| | |/ / |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
qt_accHotKey() was pretty buggy; it could both crash or spin forever
in some cases.
Task-number: 221731
Reviewed-by: alexis
(cherry picked from commit b33ebce3de3efd98a45c8ca0a349f78aac09c875)
|
| | | |
| | | |
| | | |
| | | |
| | | | |
BT: yes
(cherry picked from commit 61abefeb649fdbc4653bd69415431cabd640e4ce)
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
(cherry picked from commit 8fc0d4ed0d306e131276ce6e4dd236ca42582d9a)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Made a mistake when pushing e0706ca2fbce063c263bad9a1eee24f057f170bd
I Corrected this.
Task-number: 250254
Rev-by: Frans Englich
Rev-by: Geir Vattekar
(cherry picked from commit 809b192f245f24e3e17655e4f5f335bee4bcad79)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
glpixmapfilter should not be compiled for OpenGL ES 2.0 on nay platform
Reviewed-by: Tom Cooksey
(cherry picked from commit 9f6146dd3a7c111923e79c490c9504f39b205f0b)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Stated a remark about the need to use well-formed XML as input to the example.
Rev-by: Geir Vattekar
(cherry picked from commit e0706ca2fbce063c263bad9a1eee24f057f170bd)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The NSOpenGLContext seems to be tied to the window. So if the view
changes from one window to another, the OpenGL context needs to be
cleared. We can do this by hooking into the viewWillChangeWindow and
viewDidChangeWindow events and clear and reset the drawable
respectively. We also found out that QCocoaOpenGLView was not being used
at all, so just remove it to get rid of any confusion.
Task-number: 250066
Reviewed-by: Trond
(cherry picked from commit b4234ab3f4dbd8c7017d749888b2d8effd3c5983)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We did not update initGtkWidgets on theme changes which could
lead to crashes as the contents of the widget hash depend on
certain properties in the style. A simple way to reproduce this would
be to change between the redmond gtk theme and cleanlooks.
Task-number: 251115
Reviewed-by: paul
(cherry picked from commit a55f477b2a40b89e690fe6b61509cf665e96243b)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
emit disconnected() if we were in ConnectedState or in ClosingState
before
Reviewed-by: Thiago
Task-number: 250976
(cherry picked from commit 85db19b2eef0f7933fa28e8e5e1d365aab72458a)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The submenu would always appear to the side of the menu instead of its
right.
Task-number: 250673
Reviewed-by: ogoffart
(cherry picked from commit 8f223e03effba1aef6be5e50caf7482af1d7dd8a)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit 66fe4167b123c644874216af4f1c1a2fb3c478b2.
Oops, missed the bit in the comment about not fixing for a 4.5 patch
release.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
RevBy: mauricek
Details: using prefix qt_ instead of ::global namespace
(cherry picked from commit 9904f77b26d3b75f8ed53e82c14ff8e9baf710dc)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Regression caused by optimizations in QGraphicsItem and QGraphicsScene.
The changes in QGraphicsItem fix bugs in QGraphicsItem::mapToParent
functions, which did the translation before applying the transformation,
instead of the other way (transform, then translate). This bug caused
almost all mapToParent and mapRectToParent functions to behave wrongly.
Unfortunately the new helper functions in QGraphicsScene for discovering
items made use of these functions, which introduced a regression. Fixing
these functions also fixes item discovery.
The other part of this change fixes a regression caused by c1909321,
which luckily happened after 4.5.0 and never saw the light of day. The
fix is to also invalidate the cached clip path even if there is no scene,
which is necessary if you build your scene graph outside the scene, and
finish off by adding the root item to the scene.
Task-number: 250680
Reviewed-by: Alexis
(cherry picked from commit 7a0f9ae94ca7a47dc285431d31f6839c07870194)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
[regression]
The problem was that we didn't update the new region when we paint the
rubber band and we scroll at the same time
BT:yes
Task-number: 245766
Reviewed-by: bnilsen
Reviewed-by: andreas
(cherry picked from commit 0f6950e11389a3ddf657116a98ee8f4ec0753eb4)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This change shows a limitation in Graphics View caused by QPen's
default width being 0 (cosmetic), while Graphics View actually
does not support cosmetic pens at all. Because items are at risk of
drawing lines that poke 1 pixel outside their bounding rect,
QGraphicsView must look for items that are up to one pixel
larger than their bounding rect mapped to viewport coordinates.
Furthermore, mapToScene(QRect) forces us to adjust the
input rectangle by (0, 0, 1, 1), because it uses QRect::bottomRight()
(etc) when mapping the rectangle to a polygon (which is _wrong_). Since
this behavior has been there since 4.2, we don't want to fix it in
a 4.5 patch release...
The only _proper_ fix to this problem is for the view to know the item's
"adjust" in device coordinates, allowing items to use cosmetic pens
freely. Fex, we could introduce QGraphicsItem::viewportMargins() or so.
Added an autotest to ensure this doesn't break again.
Reviewed-by: bnilsen
(cherry picked from commit cc18633fe45d599bfeac2a8b2737d155f1dd5564)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
0aa2ef27249dc8e782c2942340776bb19de80a0d
RevBy: TrustMe
AutoTest: tst_QGraphicsItem::boundingRegion() pass again
Details: The original code adjusted the QRect version of a mapped bounding rect,
wheras my patch adjusted a mapped bounding rect (QRectF) and then
converted it to a QRect.
(cherry picked from commit 416fd77e653d089b7832002a68d5b7725fa492db)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
RevBy: Andreas
AutoTest: Still pass
Details: QRectF::intersects does not work with flat rectangles, so
we cannot intersect the bounding rect without adjusting it
first.
(cherry picked from commit 3dc62362f3380fa653bc1225ce06e5e4cefa745a)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
RevBy: Olivier
AutoTest: Still pass
(cherry picked from commit 32767aa5699937a3737b9515f4f82acc04ccdfcd)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
RevBy: Andreas
AutoTest: tst_QGraphicsView::itemAt2 pass again
Details: A QPoint in the view has to be mapped to a pixel in the
scene, otherwise it won't be possible to e.g. click
on items that are smaller than a pixel.
So...we have to optimize the hit-testing code in another way
(cherry picked from commit 79799ec4788692d44862832d85f80953d386cb27)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
RevBy: Andreas
AutoTest: included
(cherry picked from commit d516e5fbed3a7eac20229ead34221c732f85cdb6)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We can shortcut quite some calculations for the common case
by first checking whether the point is contained in the
control point rect.
(cherry picked from commit bc3d96a902d16a9bb358c05de9f6bfede3594731)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Implement specialized (and more efficient versions) of item_helper()
and child_helper() that test for QPointF in the scene.
(cherry picked from commit 30d01c387179160c8c418ecedfb4506a55d282e8)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
AutoTest: Still pass.
Details: It's easier to read and understand the code now.
(cherry picked from commit 73ce29e6bc09651a4e70b5e61c36d56e568905c7)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
AutoTest: Still pass.
Details: Update requests can be discarded if the item itself is
clipped away and the item clips all its children to shape.
This cut-off is extremely effective (and aggressive:))
(cherry picked from commit 23c73210fc79055f4bac44de0e43f9917f8d0e7f)
|
| | | |
| | | |
| | | |
| | | |
| | | | |
AutoTest: Still pass
(cherry picked from commit d85835580463f88df6a71d27d2577739e5366f68)
|
| | | |
| | | |
| | | |
| | | |
| | | | |
AutoTest: Still pass
(cherry picked from commit 15098c5ec73db5de8ca724f744a1484f888ed271)
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Details: It's clipped away regardless.
(cherry picked from commit 5564ef89f46fe96aa0b22b888a9a8ba053eea6c7)
|
| | | |
| | | |
| | | |
| | | |
| | | | |
RevBy: TrustMe
(cherry picked from commit a914eb155e085ba0efa5b95154bf7345d4be7cd7)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
AutoTest: Still pass
Details: Get rid of QTransform::inverted()/operator*= and do
nothing if the item clips all its children and the update
rect is outside the bounding rect.
(cherry picked from commit 9ed299a3edba92791e1c5af64b8fd9c9fe74c0ea)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
AutoTest: Still pass.
Details: Update requests can be discarded if the item itself is
clipped away and the item clips all its children to shape.
This cut-off is extremely effective (and aggressive:))
(cherry picked from commit 0d959a6c402ea3a3a55d7076d453d4bdbf8dce8e)
|
| | | |
| | | |
| | | |
| | | |
| | | | |
RevBy: Andreas
(cherry picked from commit deccc867b244fbc52ca58e21623febbc27310b05)
|
| | | |
| | | |
| | | |
| | | |
| | | | |
RevBy: TrustMe
(cherry picked from commit 95fa7a93bc840e0f49ee30e76abb2b4f8579c997)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
RevBy: Andreas
AutoTest: still pass
Details: Adds emptyClipPath bit, a cut-off to test if the item
has an empty clip path (i.e., is clipped away). Also adds
code for invalidating the cache from inside setPos().
(cherry picked from commit c1909321a486621ef196dd4bb3cf354406d86d46)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit 5910dbe6e7a024301d431102703f9abe323ebd13)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
RevBy: Olivier
AutoTest: Still pass.
Details: Items usually don't have effective opacity, i.e. it is 1.0, so
don't bother doing fuzzy compare if that's the case.
(cherry picked from commit bd4b177e051852f0fb94df9c0ee2e512478e0d38)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
RevBy: TrustMe
Details: ...otherwise it'll be empty and too much will be clipped away.
(cherry picked from commit 4d019e66fb62d6f25627144539abd7f59413abee)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Make sure we use the rect-variation of QGraphicsScene's item lookup
functions if the view has a simple transform and a simple expose
region.
Reviewed-by: Bjoern Erik Nilsen <bjorn.nilsen@nokia.com>
(cherry picked from commit 4020327503eaefae42da4bd6e71125b6972ac97f)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
RevBy: Alexis
AutoTest: Still pass
Details: findItems() does almost exactly the same as
QGraphicsView::items, the only difference is that it checks
whether we are about to redraw all items. Next step
is to optimize the items_helper functions.
The patch does also include a fix for
::items/childItems_helper(const QPainterPath ...); it didn't
take Qt::Intersects/ContainsItemBoundingRect into account
(in the same fashion as we do in the other helper functions).
(cherry picked from commit f4547b98b52bfc95fb0c14ec58df204cfcec0db2)
|