| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g'
Manually patched files:
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
src/3rdparty/s60/eiksoftkeyimage.h
tools/qdoc3/test/qt-project.qdocconf
tests/auto/qsharedpointer/nontracked.h
tests/auto/qsharedpointer/nontracked.cpp
Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
| |
Reflects now the real behavior of this function. Related to a false bug
report (QT-3481).
Reviewed-by: sroedal
|
|
|
|
|
|
|
|
|
|
|
| |
The cache wasn't invalidated for widgets with a graphics effect inside a
scrolling QScrollArea, so for now we disable caching for widget source
pixmaps. Also, we can't clip the source pixmap to device coordinates
since there's no knowledge of which areas of the source pixmap the
effect uses to compute the visible pixels. See change fd30cc9fabe6fc023
for the graphics item effect backend fix.
Reviewed-by: Bjørn Erik Nilsen
|
|
|
|
|
|
|
|
| |
Our graphics effects are always done in device coordinates (unless they
can be done in logical coordinates with the same result as an
optimization, e.g. opacity effects).
Reviewed-by: Andy Shaw
|
|
|
|
| |
Reviewed-by: Bjørn Erik Nilsen
|
| |
|
|
|
|
|
|
|
|
| |
Don't invalidate the cache if we're only translating and the effect rect
is fully contained within the device rect of the painter.
Task-number: QTBUG-6901
Reviewed-by: Bjørn Erik Nilsen
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
| |
Do the blur in half the resolution in software and then upload the
result as a texture and smooth-scale it on the GPU. This leads to stable
and decent performance regardless of the blur radius, and simplifies the
implementation quite a bit.
Reviewed-by: Bjørn Erik Nilsen
|
|
|
|
|
|
|
|
| |
This lets us ignore the invalidateCache call when the transform of a
graphics item with an effect changes, and the cached system is
LogicalCoordinates and cached mode is not PadToEffectiveBoundingRect.
Reviewed-by: Bjørn Erik Nilsen
|
|
|
|
|
|
| |
We need to take the pixmap item's drawing offset into consideration.
Reviewed-by: Bjørn Erik Nilsen
|
|
|
|
|
|
|
|
|
|
| |
QGraphicsEffect::boundingRectFor() needs the source bounding rect in
device coordinates. This patch fixes the documentation to reflect this,
and fixes some internal usage of boundingRectFor() to ensure it always
gets the device rect of the source.
Task-number: QTBUG-5918
Reviewed-by: Bjørn Erik Nilsen
|
|
|
|
|
|
| |
Someone had changed an operator==() and an operator!=() from
single parameter members to two-parameter friends but hadn't
changed the qdoc comments.
|
|
|
|
|
|
|
| |
Q3MainWindow and Q3TitleBar depend on it.
Reviewed-By: dt
Reviewed-By: Alessandro Portale
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Get rid of QGraphicsEffectSource from the public API, instead add
convenience functions in QGraphicsEffect. This way we commit to less
API, and are free to introduce a customizable QGraphicsEffectSource
in a future release.
* Move PixmapPadMode into QGraphicsEffect and tweak the names of the
enum values.
* Make QGraphicsBlurEffect::BlurHint into a bit flag, for extensibility.
Reviewed-by: Bjørn Erik Nilsen
|
|\ |
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Building QtSvg for Symbian (ARMV5 build) fails due to the following linker
error:
QGraphicsEffectSourcePrivate::invalidateCache(bool) const
(referred from qsvgwidget.o). This function is called from the
inline destructor of QGraphicsEffectSourcePrivate. Making this
destructor non-inline fixes the problem.
It is not clear why QtSvg is instantiating this destructor, however, as
neither QGraphicsEffectSourcePrivate nor any of its derived classes are
referred to from QtSvg source.
This problem seems to have been triggered by 85e41590.
Reviewed-by: Shane Kearns
|
| |/
|/|
| |
| | |
Reviewed-by: Trust Me
|
|/
|
|
|
|
|
| |
It depends on QT_NO_GRAPHICSVIEW for now, but it is possible to remove
this dependency.
Reviewed-by: paul
|
|\ |
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/effects/qgraphicseffect.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Problem was that we painted on null pixmap. We also want to use the
pixmap cache (QGraphicsEffectSource::pixmap()) to improve performance.
Reported by Andrew Baldwin's performance team.
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Small optimization for the case where the source pixmap is cached.
Reviewed-by: Gunnar Sletta
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Added AnimationHint, which didn't make too much sense in a generic enum,
so Qt::RenderHint was moved back into QGraphicsBlurEffect as
QGraphicsBlurEffect::BlurHint.
Reviewed-by: Gunnar Sletta
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
When the effect rect changes we only need to invalidate the cache if the
mode is ExpandToEffectRectPadMode.
Reviewed-by: Gunnar Sletta
|
|/ /
| |
| |
| | |
Reviewed-by: Samuel
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* Use ExpandToTransparentBorderPadMode since we can use GL_CLAMP_TO_EDGE
to clamp to the texture.
* Shrink the bounding rects reported by the blur
and drop shadow filters (expanding by 2 * radius isn't needed).
* Use a single-pass blur for radii <= 3 to avoid the overhead of
rendering to an FBO.
* Made the fast blur setting generate filters for only a predefined set
of radii, and then use the actual blur radius to spread the sample
points outwards.
* Optimized the generated program to rely less on temporary variables,
as those seemed to not be handled very well by certain GLSL compilers.
Reviewed-by: Gunnar Sletta
|
| |
| |
| |
| |
| |
| |
| | |
There's no reason to lock ourselves to int in the API when some of the
backend could handle floating point blur radii.
Reviewed-by: Bjørn Erik Nilsen
|
| |
| |
| |
| |
| |
| | |
Usable for future optimizations.
Reviewed-by: Samuel
|
|\ \ |
|
| |/
| |
| |
| |
| |
| |
| | |
When blurring and the blur radius increases we need a bigger effect rect
to do within-pixmap-bounds filtering.
Reviewed-by: Bjørn Erik Nilsen
|
| |
| |
| |
| | |
Reviewed-by: Samuel
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is new API and we don't want to add several items that are not
strictly needed. This is a new set of features and we can grow them
once we have more input from users on what is needed.
The Bloom filter was added based on input from designers, but is not
implemented according to how designers think of blook, so the effect
doesn't meet the requirements.
The Grayscale filter is functionally a duplicate of the colorize
filter and is therefore not needed.
The Pixelize filter has no genuine usecase.
Reviewed-by: Samuel
|
|
|
|
|
|
|
| |
If an effect is applied repeatedly on the same source, just with
varying parameters, we can save a lot by caching the source pixmaps.
Reviewed-by: Bjørn Erik Nilsen
|
|
|
|
|
|
| |
There's no implicit conversion from QPixmap to QImage
Reviewed-by: Gunnar
|
|
|
|
|
|
|
| |
Avoid doing so many conversions by operating on raster pixmaps, and by
using INV_PREMUL/PREMUL instead of converting to ARGB32.
Reviewed-by: Gunnar Sletta
|
|
|
|
|
|
|
|
|
|
|
| |
The blur, drop shadow, and bloom graphics effects are scale dependent,
since they have radius and offset (in the case of drop shadow)
parameters that are specified in device coordinates. Thus, we can't
apply the effect in logical coordinates and scale up, and need to always
use the device coordinate path for these effects. The opacity and
grayscale effects still use the logical coordinate optimization.
Reviewed-by: Gunnar Sletta
|
|
|
|
|
| |
Merge-request: 1716
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
|
|
|
| |
Reviewed-by: thartman
|
| |
|