| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| | |
Conflicts:
dist/changes-4.6.2
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This was really caused by a change done to the font engine in 4.6.
We now return a pixel less for the font height in multiple widgets.
Some of these should be addressed in a separate patch. This patch
simply ensures that the text rect is not clipped, but will not
alter the height of the widget.
Task-number: QTBUG-7662
Reviewed-by: prasanth
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We want to discard all update requests when we there's a full update
pending. The problem was that 'updateAll' was reset too early causing
update requests to fall through. To prevent this from happening we
reset 'updateAll' right before the items are actually painted.
Auto-test included.
Task-number: QTBUG-6956
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (29 commits)
Compiler warning in QAbstractSlider.
Optimize QPathClipper::pathToRect.
QGraphicsScene: Use QPainter::setClipRect instead of setClipPath if possible.
QStyleSheetStyle: Fix combinaison of border-image and border-radius
Revert "QAbstractScrollArea: Wheel over a scrollarea that has only one horizontal scrollbar"
Proper Fav icon is not shown, for all the links default fav icon shown
Update changes-4.6.2.
Make DSFLIP_ONSYNC part of the default flip flags.
Fixed a failure in tst_qgl.
4.6.2 changes
Avoids a possible crash when saving the state of a main window
Implemented QGifHandler::imageCount().
Fixed compilation of the GL2 engine for OpenGL ES 2.
fix whitespace
Document that QModelIndex::child does not work for the root item
Fixed missing textures in the boxes demo.
Fix QTBUG_7714_fullUpdateDiscardingOpacityUpdate2 autotest in qws-linux
Assert failure when setting a widget focus proxy as its successor in tab order
Fixed garbled 3D Qt logo in the overpainting example.
fix crash in Phonon::DS9 backend
...
|
| |
| |
| |
| |
| |
| |
| | |
Regression since b4d642e639eabde5d72a4
Task-number: QTBUG-7737
Reviewed-by: Gabriel
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
horizontal scrollbar"
This reverts commit 46a3e518b3070cf7cb4cbbb2cb58254454cf169d.
This shown to cause more problem than it solved
Also update the changelog
Reviewed-by: Thierry
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (22 commits)
Make DSFLIP_ONSYNC part of the default flip flags.
Fixed a failure in tst_qgl.
4.6.2 changes
Avoids a possible crash when saving the state of a main window
Implemented QGifHandler::imageCount().
Fixed compilation of the GL2 engine for OpenGL ES 2.
fix whitespace
Document that QModelIndex::child does not work for the root item
Fixed missing textures in the boxes demo.
Fix QTBUG_7714_fullUpdateDiscardingOpacityUpdate2 autotest in qws-linux
Assert failure when setting a widget focus proxy as its successor in tab order
Fixed garbled 3D Qt logo in the overpainting example.
fix crash in Phonon::DS9 backend
Don't crash when running Qt on KDE with Oxygen style.
Fixes missing update when setting opacity on an item that had opacity 0.0
Avoids missing opacity updates by not propagating the ignoreOpacity flag
Cleanup in graphicsitem autotest
Adds convenience functions QGraphicsItemPrivate::isOpacityNull
Fixed a crash when QPixmaps are destroyed after the ~QApplication.
Fix GL texture leaks when pixmaps are deleted
...
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-7514
Reviewed-by: Kim
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix QTBUG_7714_fullUpdateDiscardingOpacityUpdate2 autotest in qws-linux
Assert failure when setting a widget focus proxy as its successor in tab order
Fixed garbled 3D Qt logo in the overpainting example.
fix crash in Phonon::DS9 backend
Don't crash when running Qt on KDE with Oxygen style.
Fixes missing update when setting opacity on an item that had opacity 0.0
Avoids missing opacity updates by not propagating the ignoreOpacity flag
Cleanup in graphicsitem autotest
Adds convenience functions QGraphicsItemPrivate::isOpacityNull
Fixed a crash when QPixmaps are destroyed after the ~QApplication.
Fix GL texture leaks when pixmaps are deleted
Doc fix. No need to put something deprecated if it's not.
Warn if the plugin seems to not exist instead of simply passing.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
The two views were displayed on top of each other, so some repaints were
not triggered.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Now we check that and skip it from the tab list. Auto-test included.
Reviewed-by: leo
Task-number: QTBUG-7532
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
fix crash in Phonon::DS9 backend
Don't crash when running Qt on KDE with Oxygen style.
Fixes missing update when setting opacity on an item that had opacity 0.0
Avoids missing opacity updates by not propagating the ignoreOpacity flag
Cleanup in graphicsitem autotest
Adds convenience functions QGraphicsItemPrivate::isOpacityNull
Fixed a crash when QPixmaps are destroyed after the ~QApplication.
Fix GL texture leaks when pixmaps are deleted
Doc fix. No need to put something deprecated if it's not.
Warn if the plugin seems to not exist instead of simply passing.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We need to set the paintedViewBoundingRectsNeedRepaint flag when an item
becomes visible again because when the item has opacity 0.0 the
paintedViewBoundingRects struct can get set as outside of viewport, so the
next time the item is set to visible again we need to diregard this cached
data (otherwise the item will not be updated).
Task-number: QTBUG-7714
Reviewed-by: bnilsen
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Implementation for QVGPixmapData to/fromSymbianCFbsBitmap
|
| |/ / / / /
| | | | | |
| | | | | |
| | | | | | |
functions.
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
tst_qscriptvalue_generated.cpp was generated by Jedrzej's generator
(see testgen subdirectory).
The idea is that the old isXXX and toXXX tests will be replaced entirely
by the auto-generated versions, but we keep them for now (with "_old"
suffix) until we are sure that the auto-generated versions cover everything.
|
|/ / / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The patch contain the QScriptValue autotest suite generator. Based on an
input it can generate expected tests results and simple tests cases.
The results are kept inside generated autotest implementation file
(cpp), which could be included by main test file (tst_qscriptvalue.cpp).
Generator gives great coverage for isXXX, toXXX, comparison methods.
The generator should be used manually and it is not compiled by default.
Reviewed-by: Kent Hansen
|
|/ / / /
| | | |
| | | |
| | | | |
The generated `tests/auto/tmp' directory was causing this test to fail.
|
|/ / / |
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| | |
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
|