| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When doing a full update of a parent item, by setting one of these flags,
QGraphicsItem::ItemIgnoresTransformations | ItemClipsChildrenToShape |
ItemIsSelectable, the child items that were transparent would not be
shown when setting their respective opacity to 1.0
We just need to set the ignoreOpacity flag when setting opacity to 0.0.
This avoids propagating this flag to the child items when it's not
needed.
Task-number: QT-2653
Reviewed-by: bnilsen
|
|
|
|
|
|
| |
Unified multiple class definitions for MyGraphicsView and cleaned whitespaces.
Reviewed-by: bnilsen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes quite a lot of issues:
* QtOpenGL only registered qpixmap destruction hooks on X11 and
those only cleanup the EGL/GLX surface, not the texture object.
* The QPixmap destruction hooks were only being called from the
QPixmap destructor. However, this means when a QPixmap is assigned
to another QPixmap, the hooks don't get called.
Task-number: QTBUG-7647
Reviewed-By: Samuel
Reviewed-By: Trond
|
|\
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc fix. No need to put something deprecated if it's not.
Warn if the plugin seems to not exist instead of simply passing.
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
follow-up to 0585997b7dbe25ece9f60684171c16206d10d65f
Task-number: related to QTBUG-7688
Reviewed-by: TRUSTME
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| | |
As far as I can tell, setting lib.file here is unnecessary, and it
happens to break `make test'.
The reason is that, on the first pass, qmake will generate Makefile.lib;
then, when `make' is run, it will generate Makefile, and any additional
parameters originally passed to qmake will be omitted.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix a regression: icons with slightly wrong ICO header did not load.
Fixed an endless loop if printing web pages.
don't build unneeded QtDesigner parts on Windows CE
Better support for user-generated binary shaders
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Regression was introduced by commit
fd9cdaa55da455b90eacec571aeb2c84fa55f7e0.
Also fix a completely broken autotest that didn't actually test
anything.
Task-number: QTBUG-7688
Reviewed-by: Alexis
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (70 commits)
doc: Fixed the last qdoc errors.
doc: Document the "Type" enum value as a const in variable.
Designer: Add lower/raise to context menu.
Compile with no-webkit - add missing semi-colons.
Fixes visibility update missing when doing setParentItem on graphicsitem
Stabilize tst_QGraphicsScene::polishItems2 (new test)
Fixed an infinite loop that could occur when reading invalid BMP images.
Updated docs regarding QGLWidget::renderText() limitations.
Added optimization flag to QGraphicsItemPrivate.
Fixed child items with graphics effects not inheriting opacity.
Made the trace replayer handle limited resolution cases better.
Small optimization in raster paint engine.
Another ASSERT while deleting spans
Implement QDirectFBPixmapData::scroll
Potential crash when adding items from QGraphicsWidget::polishEvent().
QGraphicsWidget is painted twice on the inital show.
Fix QPainter::redirection() to pass autotest.
Re-added the Close button in QPrintPreviewDialog for Mac/Carbon.
revert parts of 10392eef4fd4f9
Fix y-inverted pixmaps properly.
...
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Calling setParentItem is causing the previous opacity/visible updates
to be discarded because the dirty flags were not propagated to the new parent.
Also removed some unnecessary 'markDirty' and 'update' calls.
Task-number: QTBUG-6738
Reviewed-by: bnilsen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We are only interested in getting the posted MetaCall events delivered,
so we can get away with sendPostedEvents() instead of processEvents().
Makes the test also pass on Mac g++ carbon 32.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We need to invalidate the graphics source pixmap cache for both child
items and parent items when changing the opacity of a graphics item.
Reviewed-by: Bjørn Erik Nilsen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
That rare case when we are deleting the last span was not being taken care
of. Unbelievable but true. Auto-test included.
Reviewed-by: Thierry
Reviewed-by: leo
Task-number: QTBUG-6004
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
These were processed immediately, so there was a fair chance that we
could end up doing a virtual function call on items that were not fully
constructed. This patch is also an optimization, since we never remove
anything from the vector.
Auto-test included.
Reviewed-by: Jan-Arve
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Problem occured when doing something in the polishEvent() which
eventually ended up as an update(). The problem was that in
QGraphicsScene::addItem we scheduled a polish event after scheduling
an update, resulting in update requests being processed before polish
requests.
Auto-test included.
Task-number: QTBUG-6956
Reviewed-by: alexis
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We can't call QCOMPARE from within a nested function, because the
return statement will just exit that function.
VERIFY_COLOR can't be turned into a function this way.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: None, discovering while doing test refactoring
Reviewed-by: Jedrzej Nowacki
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: TrustMe
|
| | | |
| | | |
| | | |
| | | | |
Also, since domain is never empty, the idx > 0 test is unnecessary.
|
| | | |
| | | |
| | | |
| | | | |
normalize the user input first
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
if the pro file for the translations lives in a sibling tree of the
actual source tree, messages from included headers wouldn't have been
collected, as they were not considered part of the project.
Task-number: QTBUG-7495
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
previously, the semantics of nesting projects were pretty bizarre:
the list of TS files grew ever as the subdirs were visited. the
source files otoh were cleared for every project. this meant that
some TS files were updated over and over again, each time with different
data.
this is obviously total nonsense, so there is no compatibilty to keep.
so here come the new semantics:
- each project is scanned separately. it has separate include paths and
may override the inherited CODECFORSRC.
- the messages from all sub-projects are merged
- if a sub-project has a TRANSLATIONS entry, it is "detached" from its
parent project, thus starting an own merged translator. it is also
possible to name an empty set of TS files to simply exclude the
sub-project.
- CODECFORTR can be specified in each project with TRANSLATIONS
- if TS files are specified on the command line, they override
TRANSLATIONS from the top level project and stop processing of
detached projects alltogether. if multiple top-level projects are
specified, they are all merged.
this is somewhat slower, as now includes are re-scanned per project,
while previously all sources were simply accumulated and scanned as one
project. this can be fixed retroactively if needed.
|
| | | | |
|
| | | | |
|
| | | | |
|
| |_|/
|/| | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Calling setParentItem is causing the previous opacity/visible updates
to be discarded because the dirty flags were not propagated to the new parent.
Also removed some unnecessary 'markDirty' and 'update' calls.
Task-number: QTBUG-6738
Reviewed-by: bnilsen
|
| | |
| | |
| | |
| | |
| | |
| | | |
We are only interested in getting the posted MetaCall events delivered,
so we can get away with sendPostedEvents() instead of processEvents().
Makes the test also pass on Mac g++ carbon 32.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We need to invalidate the graphics source pixmap cache for both child
items and parent items when changing the opacity of a graphics item.
Reviewed-by: Bjørn Erik Nilsen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
That rare case when we are deleting the last span was not being taken care
of. Unbelievable but true. Auto-test included.
Reviewed-by: Thierry
Reviewed-by: leo
Task-number: QTBUG-6004
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
These were processed immediately, so there was a fair chance that we
could end up doing a virtual function call on items that were not fully
constructed. This patch is also an optimization, since we never remove
anything from the vector.
Auto-test included.
Reviewed-by: Jan-Arve
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Problem occured when doing something in the polishEvent() which
eventually ended up as an update(). The problem was that in
QGraphicsScene::addItem we scheduled a polish event after scheduling
an update, resulting in update requests being processed before polish
requests.
Auto-test included.
Task-number: QTBUG-6956
Reviewed-by: alexis
|
|/ /
| |
| |
| |
| |
| | |
We can't call QCOMPARE from within a nested function, because the
return statement will just exit that function.
VERIFY_COLOR can't be turned into a function this way.
|
| |
| |
| |
| |
| |
| | |
as agreed with Warwick.
This reverts commit 089ee7094eabb2058b478f5d2f306a69f6c0b3bf.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If the file/data ends in the END CERTIFICATE line without a newline,
the certificate is still valid. If it's followed by anything other
than a newline, then it's no longer valid.
Also add another test for the BEGIN CERTIFICATE ending without
newline, to ensure we don't crash there either.
Reviewed-By: Peter Hartmann
|
|/
|
|
|
| |
Task-number: 6666
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
These auto tests are working only if developer build is defined, so exclude
those otherwise.
Reviewed-by: Rohan McGovern
|
| |
| |
| |
| |
| |
| |
| |
| | |
Adds a disconnectOne() method that allows a single signal/slot connection
to be disconnected, as required by QTBUG-6781.
Reviewed-by: Warwick Allison
Reviewed-by: Olivier Goffart
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We don't want to have to listen to the destroyed() signal for every
receiver object of a connection, and likewise we don't want to create
a QObject to handle each connection; instead, remove the connection
lazily at signal emission time after we've detected that the receiver
has been deleted.
Task-number: QTBUG-7313
Reviewed-by: Simon Hausmann
|
| |
| |
| |
| |
| |
| | |
Was a cut n paste error probably.
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| | |
It is now considered as finished immediatly after creation to avoid
an event loop spin.
Had to change the auto tests a bit to account for the new behaviour.
Reviewed-by: Peter Hartmann
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix QSslCertificate issues
Change the prefered content size of the anomaly browser
Avoid painting while loading in the anomaly demo browser
QFile::readData: Simplify code
If the file is open, there must be an engine.
QFile: Fix a pre-mature pessimization
don't assert when calling QtScript-wrapped method of deleted QObject
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Thank you Matthew Cattell for the fix!
Task-number: QTBUG-6466
Reviewed-by: joao
|
| | |
| | |
| | |
| | |
| | |
| | | |
Make it behave the same as the old (4.5) back-end.
Reviewed-by: Jedrzej Nowacki
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
pointer then it should not crash but warn instead.
Task: -
RevBy: Andreas
AutoTest: Included
Details: This also fixes availableGeometry() as well to warn under
the same circumstances.
|