| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
olsFrameStyle was old.
Reviewed-by: jbache
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Daniël (1):
Memory of fixedKernel is never returned, found by cppcheck.
Request-url: http://qt.gitorious.org/qt/qt/merge_requests/419
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Merge commit 'd8a2e52e4db873a2cfd39630df47b61bec502fd1' into HEAD
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
There was an optimized blend function for this case but not an optimized
scale function. Performance increase seems to be in the order of 5x.
Reviewed-by: Trond
|
| |
| |
| |
| |
| |
| |
| |
| | |
Previously, two images with indexed colors were not equal if their
color tables were not the same. The image are not compared by
the value of the pixels
Reviewed-by: Samuel
|
| |
| |
| |
| |
| |
| |
| | |
This patch enables QGLWidget's to have an ARGB visual on X11, alowing GL
rendering on semi-transparent windows.
Reviewed-By: Trond
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Avoid needless DPI calculations when not needed, and simplify the DPI
calculations to the point where most of the operations disappear. Also
avoid calling QImage::metric() so that we don't need to go through two
switch statements and an extra function call just to get the width of a
pixmap.
Reviewed-by: Trond
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When we have already a pixmap of an item in the cache, we should
remove the entry from the cache otherwise when we will repaint/modify
the copy of the pixmap (the copy of the cache) then we will trigger a
deep copy ; this is because both entries in the cache and our copy
share the same data and if you modify one of them a copy is triggered.
I have added a benchmark as well to test that.
Reviewed-by:bnilsen
Reviewed-by:andreas
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We had a report from a customer saying this breaks if the decimal
separator is the same as the group separator. This is not really
something we want to support, but because this fix is easy and cleanup
the code I decided to fix it.
Reviewed-by: Thierry
Task-number: 253962
|
| |
| |
| |
| | |
no more warnings while generating the docs
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
If we don't remove the pixmap from QCache first then the key is invalid
and the removal failed
Reviewed-by: sroedal
|
| |
| |
| |
| | |
Reviewed-by:TrustMe
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
Wherever I found that we were using a string instead of a single char
I fixed the code.
Reviewed-by: olivier
|
| |
| |
| |
| |
| |
| | |
The brush transform needs to include the rect position.
Reviewed-by: Trond
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QMessageBox::question() has the wrong default value for
one of its arguments, but fixing it may break existing code,
and the workaround is trivial (just specify an explicit
value for the default argument).
Reviewed-by: TrustMe
Task-number: 254131
|
| | |
| | |
| | |
| | | |
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This restore the KDE3's behaviour.
Do not disable it on Windows as we are aware of customer using the
QPlastiqueStyle on Windows that might rely on this (for behaviour
consistancy with others Windows applications)
Reviewed-by: jbache
Task-number: 254210
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/kernel/qsharedmemory_unix.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
newline
Do the same special case as for QTextEdit
(yes, this is a pitty that we have special cases like that
Reviewed-by: Thierry
Task-number: 252532
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The problem was that we installed an eventfilter regardless if the
gtk symbols were defined or not. Instead we now initialize and
check for the symbols before we install the filter.
Task-number: 254342
Reviewed-by: ogoffart
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by:thierry
|
| |\ \ \
| | |/ / |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If ensureSpace causes the layoutData to reallocate then the
initialGlyphs pointers will no longer be valid.
Reviewed-by: Simon Hausmann
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If Harfbuzz shaping adds or merges glyphs we need to move the remaining
glyphs in the glyph layout to compensate.
Task-number: 253783
Reviewed-by: Simon Hausmann
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Rather than try to resolve functions or impose configure time
limitations we simply remove the dependancy entirely and rely on the
fallbac for all platforms.
Task-number: 250731
Reviewed-by: thiago
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We currently don't support subpixel hinting when drawing text to a
QImage on Mac. The alpha map that is returned by the font engine
is a plain 8 bit gray mask, which means we have to switch off subpixel
hinting when we draw the glyph for caching.
Task-number: 249178
Reviewed-by: Samuel
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit 30f7edc0aab629499b74263391ae529ad31b2ff8.
There is no way to restore float-equal warning using the pragma trick.
This means (as it was mentioned in the said commit log) anyone that
includes qtransform.h will be forced to deal with float-equal.
Reviewed-by: Samuel Rødal
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In 4.5 the toolbutton icon rendering was changed somewhat and the
bottom line of text for tool buttons icons with TextUnderIcon set is
incorrectly clipped on Windows. The style reserves only 5 pixels but
tries to use 6 pixels for text and icon spacing, hence we adjust the
text rect one pixel up. This should be safe considering the fact that
we have a margin on both sides of the icon already and avoids actually
moving the icon positioning.
Task-number: 252554
Reviewed-by: trond
|
| |\ \ \ |
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | | |
kinetic-animations
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
kinetic-animations
Conflicts:
src/corelib/kernel/kernel.pri
src/corelib/kernel/qvariant_p.h
src/corelib/tools/tools.pri
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicswidget.h
src/gui/gui.pro
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Trust Me
|
| | | | | | | |
|
| | | | | | | |
|
| | |\ \ \ \ \ |
|
| | | |\ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
into kinetic-animations
|
| | | |\ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
into kinetic-animations
|
| | | | | | | | | | |
|
| | | |_|/ / / / /
| | |/| | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
We decided to remove the const of the eventTest() since some transitions
have dynamic conditions and need to update when eventTest() is called.
|
| | | |/ / / / /
| | |/| | | | |
| | | | | | | |
| | | | | | | | |
We won't release another Qt Solution, so the define is no longer needed.
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
into kinetic-statemachine
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
|
| | | |/ / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Accessing the event can be useful. E.g., onEntry() can do some
common event processing regardless of which transition caused the
state to be entered; onTransition() can be used in combination
with eventTest(), where eventTest() would first check that the
input matches some criteria, and then the actual processing of that
input would be done in onTransition.
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Result of API review.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Result of API review. A == comparison of the modifiers is not useful.
The common case is you want to test if one or more modifiers are set,
i.e. a mask check.
|