| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
Otherwise we crash with latest WebKit trunk because the
SourceProvider is prematurely destructed.
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: Put the correct images with the D-Bus and Embedded Linux sections.
Call cheaper clear() instead of assigning new QString()
Fix some foreach usage to use const refs
googlesuggest example: Add newline to end of file
Core classes, examples, demos: Some changes from string to char
Fix header labels on mac with rtl
|
| | | |
| | |
| | |
| | |
| | | |
Reviewed-by: joao
Reviewed-by: Peter Hartmann
|
| | | |
| | |
| | |
| | | |
Reviewed-by: joao
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Peter Hartmann
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The removed code simply reduces the size of the rect when running
with RightToLeft without compensating anywhere else. It seems to be
a leftover from a previously removed piece of code.
Reviewed-by: richard
Task-number: QTBUG-6882
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |\ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Entering a page range which is valid, but outside of the printable
range would result in an infinite loop.
Task-number: QTBUG-6051
Reviewed-by: Simon Hausmann
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If the user provided their own shader with glShaderBinary(),
QGLShaderProgram::addShader() would refuse to add it because
it wasn't marked as "compiled". According to the OpenGL/ES 2.0
specification:
"It is permissible to attach a shader object to a
program object before source code has been loaded into the
shader object or before the shader object has been compiled."
Based on this, the compile check has been removed from addShader()
which should make supporting binary shaders easier.
Similarly, link() and programId() have been modified to support
applications that use glProgramBinaryOES() to specify program binaries.
Task-number: QTBUG-7490
Reviewed-by: Tom Cooksey
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
...
|
| | | |\ \ \ |
|
| | | | |\ \ \
| | | | | |/
| | | | |/|
| | | | | |
| | | | | | |
Conflicts:
src/gui/graphicsview/qgraphicsscene.cpp
|
| | | |/ / / |
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-7530
Reviewed-by: Kim
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Trust Me
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Avoid traversing the whole child hierarchy when opacity changes unless
there are children with graphics effects.
Reviewed-by: Bjørn Erik Nilsen
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Don't repeatedly update the pen / brush if no pen / brush is set.
Reviewed-by: Gunnar Sletta
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This is a very operation in DirectFB and saves a fair bit of overhead.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Trond
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Modal Mac/Carbon dialogs do not have the close, minimize and resize
window title buttons enabled, which makes it very hard to close modal
dialogs.
Task-number: QTBUG-7481
Reviewed-by: Kim
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
There is a lot of code depending on that pixmaps are flipped
upside down in the gl graphicssystem, so toggling this requires
extensive testing. Since we're anyway questioning the relevance
of this feature (compared to raster + GL viewport) its simply not
worth the effort to fix it properly right now.
Revert "Fixed y-inverted pixmaps on N900."
This reverts commit 57473d5d2a7bd6ae3117f61ff29264a1b790bb01.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Need to bind the PMV matrix's attributes to their indexes in the
simple shader, which is created in a seperate code path to all the
other shaders. This should fix the qgl autotest failures.
Reviewed-By: TrustMe
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QmlGraphicsItem doesn't need any parent change notifactions so we can
call the helper class (QGraphicsItemPrivate::setParentItemHelper)
direclty from QmlGraphicsItem::setParentItem. This avoids a lot of unnecessary
instructions related to QVariant constructions as well as virtual
function calls.
I've made the variant pointers explicit in the declaration of
setParentItemHelper so that we don't accidentally call setParentItemHelper
from places where we need parent change notifications.
Task-number: QTBUG-6877
Reviewed-by: alexis
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We need this change in order to bypass some of the QVariant itemChange
notifications from QGraphicsItem::setParentItem. All this is internal
stuff and we know what we do, so I don't consider the change too ugly.
Task-number: QTBUG-6877
Reviewed-by: alexis
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We don't have to do a full blown QGraphicsItem::setFlag call from
QGraphicsItem::setFlags, only to change the ItemStacksBehindParent
bits. We can do it directly (with care).
Task-number: QTBUG-6877
Reviewed-by: alexis
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Make sure we do cheap tests before the more expensive ones.
This function is called from QGraphicsScene::addItem.
Task-number: QTBUG-6877
Reviewed-by: alexis
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The biggest optimization here is "updateAncestorFlags()". It's much
faster to update all the flags rather than trying to enable/disable
certain flags according to the current state.
Task-number: QTBUG-6877
Reviewed-by: alexis
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When the line edit was refactored into a line control this regression
was introduced. This regression was introduced by change
fb7d86cf23227302d48db279ec589221d11a1f6a.
Task-number: QTBUG-4789
Reviewed-by: Alan Alpert
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This makes GLSL dumps _significantly_ easier to read.
Reviewed-By: TrustMe
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This has several advantages: First, updating an attribute value
seems to be cheaper than updating a uniform. Second, vertex atribute
values are independent of shader program, which means they persist
across changing of the shader program. This makes code simpler and
reduces GL state changes. Note: Credit goes to Samuel for finding
this little gem. :-)
For the 25920 solid QGraphicsRectItem test case, this gives 10%
improvement on desktop and 27% on the SGX.
Reviewed-By: Kim
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-By: Samuel
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-7418
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Eskil
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
menu hiding.
The problem here was the way we entered Full Screen Mode. We were using
"kUIModeAllSuppressed" which does the following according to the manual:
kUIModeAllSuppressed
All system UI elements (including the menu bar) are hidden. However,
these elements may automatically show themselves in response to mouse
movements or other user activity.
I changed it to "kUIModeAllHidden", which does the following:
All system UI elements (including the menu bar) are hidden.
To prevent a change of behavior I added the following option to the
SetSystemUIMode:
kUIOptionAutoShowMenuBar
This flag specifies that the menu bar automatically shows itself when
the user moves the mouse into the screen area that would ordinarily be
occupied by the menu bar.
Only valid for the presentation mode kUIModeAllHidden.
Task-number: QTBUG-7625
Reviewed-by: Richard Moe Gustavsen
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This patch closes the menu bar if it's open when it gets
destroyed
Task-number: QTBUG-6597
Reviewed-by: cduclos
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The reason is that the test first creates a menu bar with an exit item
The exit item gets merged into the appmenu (together with a QAction)
Then we destroy the menu bar, but leave the exit item in the appmenu untouched.
Then we create a new menubar _without_ an exit item
macUpdateMenubar will then, at one point, try to access the old exit item's
QAction, wich is destroyed a long time ago; crash!
This patch will make sure we clear out all actions in the menu bars appmenu
when the menubar gets destroyed.
Reviewed-by: Prasanth
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: None, discovering while doing test refactoring
Reviewed-by: Jedrzej Nowacki
|
| | | |/ / /
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-7605
|
