| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
| |
This fixes 005dc6c7448a724d3df496a1e528199f5a638ce0 that was pushed by mistake.
Task-number: QT-3349
Reviewed-by: trustme
|
|
|
|
|
|
|
|
| |
This is a partial backport of a fix that was pushed to 4.7
(734ba1f540aaedc4a3558268bd7350c0b15325a4)
Task-number: QT-3349
Reviewed-by: trustme
|
|
|
|
|
|
|
|
|
|
|
| |
The geometry was not properly set because QGraphicsWidget rely on itemChange
to update its own geometry. Now when calling setPos we also ensure that
for a widget the geometry will be up to date. Setting the flag
ItemSendsPositionChanges to false for a given widget will give a small
performance boost.
Reviewed-by:janarve
Reviewed-by:bnilsen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When focusInEvent is called we need to ensure that WA_InputMethodEnabled
is set, since FocusInEvent might lead to that
QInputContext::setFocusWidget is called (with the QGraphicsView as the
widget parameter).
However, if the widget still does not have WA_InputMethodEnabled set
yet it will assert in QInputContext::setFocusWidget (it requires that
the widget has the flag set).
This was a problem for the morbit bridge, where Dui requires the
attribute to be set (while Orbit actually does not require)
Task-number: QTBUG-10276
Reviewed-by: jasplin
Reviewed-by: Alexis Menard
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Problem was that the item's cache was not invalidated from
prepareGeometryChange(). We did invalidate the cache for all the
ancestors, but not for the item itself. To avoid looping through the
whole parent chain twice, we invalidate the item's cache before
walking the parent chain. It would be nice to centralize the cache
invalidating mechanism, but for now it's OK to solve it like this.
Auto test included.
Task-number: QTBUG-9551
Reviewed-by: samuel
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QMenu: Behavior regression
Mac: Graphics View starving user events and sometimes crashes.
Fixed a crash on Windows 7 systems with invalid PrinterPorts entries.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Problem was that we called processEvents() and excluded user input
events. The idea was to only process pending update
requests, but by doing that there's also a chance that user input events
will starve. Also, there's no gurantee that only update requests
will be processed by processEvents(), so a safer solution is to call
"HIViewRender" on Carbon and "displayIfNeeded" on Cocoa. This will for
sure dispatch pending update requests and nothing else (which is exactly
what we want).
No auto test regressions.
Fixes tst_qgraphicsproxywidget::updateAndDelete failure on Carbon.
Benchmarks indicate an increase in performance.
Task-number: QTBUG-7502
Reviewed-by: richard
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Symbol visibility fixes for RVCT4 on Symbian
Symbol visibility fixes for RVCT4 on Symbian
Symbol visibility fixes for RVCT4 on Symbian
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
RVCT 4 is far more strict with regards to symbol visiblity that RVCT
2.2, and will hide symbols unless all references have default visibility
in the object files. Update the various places in Qt code where the
symbol visibility was set incorrectly for DLL-based platforms (those that
use __declspec(dllimport) and (dllexport).
Note: QtWebkit and QtScript are fixed in different commits.
Task-number: QTBUG-9903
Reviewed-by: Jason Barron
|
|/
|
|
|
|
|
|
|
| |
Help event was not propagated to the widget. Also fixes tooltip value
propagation when setting it on the proxy or on the widget.
Autotest included.
Task-number: QTBUG-5349
Reviewed-by: bnilsen
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
Incorrect simple conversion of the exposed rect from QRectF to QRect
when rendering the widget.
Task-number: QTBUG-7296
Reviewed-by: bnilsen
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Reviewed-by:michael brasser
|
|
|
|
|
|
|
|
|
|
| |
Going back to always blitting the newly painted areas to the cache (and
not blending it like before). To avoid painting artifacts when the item
is rotated and when it uses DeviceCoordinateMode cache mode, the entire
cache is always repainted in that case.
Task-number: QTBUG-7863
Reviewed-by: trustme
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The #include "moc_qgraphicswidget.cpp" is superfluous and caused these
link errors:
.obj/debug-shared-emb-x86_64/moc_qgraphicswidget.o:(.data.rel.ro+0x0): multiple definition of `QGraphicsWidget::staticMetaObject'
.obj/debug-shared-emb-x86_64/qgraphicswidget.o:(.data.rel.ro+0x0): first defined here
.obj/debug-shared-emb-x86_64/moc_qgraphicswidget.o: In function `QGraphicsWidget::metaObject() const':
Presumably this only happens when you have a stale moc file sitting
around but it's a bug none-the-less.
Reviewed-by: TrustMe
|
|
|
|
|
|
|
|
|
| |
No repaint is triggered anymore when setting the cache mode to
DeviceCoordinateMode when already using that mode.
Also added an autotest for checking repaints when setting cache modes.
Task-number: QTBUG-9391
Reviewed-by: ahanssen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Commit adds a private property that QML can use to add children for a given
item. This is a custom list that calls a callback which actually reparent
the item instead of just appending in the list (otherwise it will mess up
the state of QGraphicsView). This is needed because childItems() is pretty
useless you get a list but if you append something on it then it adds
that into a copy. Also the children property is the default property
a concept used by QML.
Width and Height private properties has been added in order to support
better the integration with QGraphicsWidget in QML. The actual implementation
is in the private class of QGI and QGraphicsWidget reimplements it to return
the geometry. (In 4.7 QDeclarativeItem reimplements it too).
This change should be harmless everything is private.
Task-number:QT-2757
Reviewed-by:andreas
|
|
|
|
|
|
|
|
| |
The effect might rely on a child to draw itself. So we need to redraw if
a child become visible or invisible.
Task-number:QTBUG-7843
Reviewed-by:janarve
|
|
|
|
|
|
|
|
|
|
| |
Before calling addItem we need to invalidate the depth otherwise if
someone call anything relating to sorting when itemChange is called
(because of the scene change for instance) then qt_closestItemFirst
for example can crash because of an invalid state.
Task-number:QTBUG-6932
Reviewed-by:janarve
|
|
|
|
|
|
| |
We bundle the size and the geometry into the same NOTIFY signal.
Reviewed-by:akennedy
|
|
|
|
|
|
|
| |
Just add the notify + the signal.
Task-number:QTBUG-8277
Reviewed-by:yoann
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Stabilize taskQTBUG_7863_paintIntoCacheWithTransparentParts auto-test.
Optimize getting bearings of a glyph on Windows for true type fonts
Fixes blending problem when paiting non-opaque items with cache enabled.
Optimize speed of QTextLayout and QPainter::drawText
Fix a crash in animation groups when deleting uncontrolled animations
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In most cases when partially updating an item, the old content of the
cache needs to be replaced with the new content
(CompositionMode_Source). But in a specific case when using
DeviceCoordinateCache and when the item is transformed, the new content
needs to be blended (CompositionMode_SourceAtop) with the old one to
avoid incorrect fully transparent background.
Autotest included.
Task-number: QTBUG-7863
Reviewed-by: bnilsen
|
|/
|
|
|
|
|
|
|
|
|
| |
This also fixed the issue where an input panel would not be requested
by the widget, because it thought it was being focused over and over,
instead of focused, and then clicked (focus followed by click is
default input panel popup behavior on Symbian).
AutoTest: Included and passed
RevBy: yoann
RevBy: Jan-Arve
|
|
|
|
|
|
|
|
|
|
|
| |
Add Q_DISABLE_COPY to QGraphicsSceneEvent and all the sublasses
The code would anyway not compile before as the QScopedPointer does
not know QGraphicsSceneEventPrivate in use code.
But now we have better error reporting.
Reviewed-by: Thierry
Task-number: QTBUG-8803 (related)
|
|
|
|
|
|
|
|
|
|
|
| |
This change partially reverts commit a589005f and therefore fully reverts
68be6457. We cannot assume that only opaque pixels are painted in
drawBackground().
Regression against 4.5. Auto-test included.
Task-number: QTBUG-8168
Reviewed-by: trond
|
|
|
|
|
|
|
|
|
|
|
| |
The focus is now properly cleared when hiding or showing focus scopes or
when a child of a focus scope is destroyed.
No change of behavior in how focus scope works for QML.
Autotest included.
Task-number: QT-2649
Reviewed-by: Andreas Aardal Hanssen
|
|
|
|
|
|
|
|
| |
We can't clip source pixmaps to the device rect, as there's no way of
knowing which parts of the source pixmap are needed for the part of the
graphics effect that's unclipped.
Reviewed-by: Bjørn Erik Nilsen
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Problem was that the cached view bounding rect was never updated when
overriding QGraphicsScene::drawItems or QGraphicsView::drawItems, without
calling the base class implementation. The same for 'updateAll' boolean.
We also have to make sure there are no unpolished items before we draw.
Regression against 4.5.
Auto-test included.
Task-number: QTBUG-7880
Reviewed-by: yoann
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QLineEdit shows leftovers of edit cursor after clear()
doc: Added indication of default modality value for panels.
doc: Added QScopedArrayPointer and corrected QScopedPointer snippet.
Improve test coverage of QScriptString::toArrayIndex()
QColorDialog::open() freezes the app the *second* time it is used on Mac
doc: Corrected typo.
doc: Removed bad grammar.
doc: Added \obsolete.
doc: Added \since 4.6 to the properties.
doc: Removed some erroneous text.
|
| | |
| | |
| | |
| | | |
Task: QTBUG-7970
|
| | |
| | |
| | |
| | | |
Task: QTBUG-7965
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This only happened with items that had either negative width or height
(boundingRect().width()|height()). Problem was that in case of not having
an exposed region (drawing items from QGraphicsScene::render), we simply
checked whether the bounding rect was empty or not. This is fine, however
we have to normalize the rect first.
(Note that QRegion::intersects(rect) always normalizes the rect, so
that's why this use case broke only when calling QGraphicsScene::render).
Auto-test included.
Task-number: QTBUG-7775
Reviewed-by: yoann
|
|/
|
|
|
|
|
|
|
|
|
| |
QGraphicsScenePrivate::setFocusItemHelper accesses
views.at(i)->inputContext() without checking if it is null.
This leads to a crash if it really is null.
Fixed by adding a null pointer check.
Task-number: QT-3008
Reviewed-by: axis
|
|
|
|
|
|
|
| |
If its not placed in the right place then it will cause the doc to lose
the line that \obsolete is on
Reviewed-by: TrustMe
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QGraphicsItem
After propagating QEvent::TouchBegin, if there is no item that has
accepted and handled the event, we must remove the touch point from our
data structures.
In this situation, QGraphicsScene will ignore the TouchBegin, as will
QGraphicsView, and QApplication will respond by not sending any more
touch events to the view/scene/item. This means our logic for handling
TouchPointReleased points will never be called (and the QGraphicsScene's
itemForTouchPointId and sceneCurrentTouchPoints state will be
incorrect).
Reviewed-by: Denis Dzyubenko
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
| |
Since the \obsolete was not at the beginning of the function
documentation it was not showing it correctly
Reviewed-by: TrustMe
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Events should not propagate outside the panel. Also when delivering gesture
events we should respect panels modality.
Task-number: QTBUG-7451
Reviewed-by: Mikko Harju
Reviewed-by: Bradley T. Hughes
|
|/
|
|
| |
Task: QTBUG-7967
|
|
|
|
| |
Task: QTBUG-7997
|
|
|
|
|
|
|
|
|
|
| |
The DataStore could have been destroyed before.
Even if having static QGraphicsItem is not really supported, it is
better not to crash
Task-number: QTBUG-7629
Reviewed-by: bnilsen
|