| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
Add a README.md mentioning the documentation on where the ported
effects can be found, as well as how to check out the Qt5 branch.
Pick-to: 6.2
Fixes: QTBUG-95757
Change-Id: Ib47c7e73f8622c8e287df0f74c6f16a5113b357e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Also make Quick an optional package.
Also update qtdeclarative dependency to latest integrated sha1 in
qt5.git
Change-Id: I851f825abc9484b5bda6cd60eca6ddb1b0d8e2b7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Change license headers in source files, update copyright year for Qt
Company entries, remove GPL and LGPL license files, add a 3-clause BSD
license file.
Tests and tools continue to be licensed under GPL with Exceptions.
Fixes: QTBUG-85256
Change-Id: I7a772c7746a00dd6aa3e6401a048a9229c291f6f
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The following are based on static shader code, and after porting the
shaders they will work fully identically to 5.15:
FastBlur
Colorize
OpacityMask
BrightnessContrast
ColorOverlay
Desaturate
Displace
GammaAdjust
HueSaturation
LevelAdjust
RectangularGlow
Thresholdmask
LinearGradient
RadialGradient
ConicalGradient
The following change behavior:
Glow
DropShadow
These now only have the fast variants, because those rely on static shader code.
So we are going back to the Qt 5.5 versions and make them behave as if 'fast'
was always set to true. The 'fast' and 'samples' properties are removed.
The following are removed:
Blend
GaussianBlur
DirectionalBlur
MaskedBlur
RadialBlur
RecursiveBlur
ZoomBlur
InnerShadow
The autotest and the gallery application (run qmlscene testBed.qml in
tests/manual/testbed) have been adjusted accordingly and now work across
all QRhi backends.
The docs may still refer to removed effects in some code snippets. Updating
that is left as a separate exercise.
[ChangeLog] Graphical Effects no longer relies on dynamically generated
shader strings. The following effects have been removed: Blend, GaussianBlur,
MaskedBlur, RadialBlur, RecursiveBlur, ZoomBlur, InnerShadow. Glow
and DropShadow always use the 'fast' variant. The fast and samples
properties for these are thus no longer applicable and have been
removed.
Change-Id: Ife83f3828f37977596fd34f8da8b61961f0ed28a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
|
|
|
|
|
|
|
| |
Change-Id: If53bcd94a338c62bf69ed7f74c6a8bc5ff4818ed
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
|
|
|
|
|
| |
Change-Id: I3499e0bfaefec73f16132a3da6dd2e5088dc7879
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
|
|
| |
Find the BuildInternals package in order to find
qt_set_up_standalone_tests_build()
Change-Id: If7396d5ad1ba873a3fc277dcd1677f185677834d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
| |
Change-Id: I15eef405dd8d1323850a22daf7258fb755d36dc1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
| |
Change-Id: Id44980471c9e78ef6d7525c4c24de201207b95c9
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
|\
| |
| |
| | |
Change-Id: Id5ceea2d4517a91f6ce5039711669ea419aad4c3
|
| |
| |
| |
| |
| |
| |
| | |
... of Q_FOREACH, Java-style iterators, and QLinkedList use.
Change-Id: Ied30922433d2c3afc599f4e59a4082324b8b2957
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
|
|/
|
|
|
|
| |
Task-number: QTBUG-75999
Change-Id: Id47cd7a769a27a6776ced0ce92b89a8bdf4f7da1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
First of all, we need to include a dummy.qml which imports the
graphical effects, otherwise it will be ignored by qmlimportscanner,
since all the QML code is generated programmatically.
Second of all, using the Qml2ImportPath to look up the imports is
not sufficient on Android, where the QML2_IMPORT_PATH environment
variable is used instead. So we just add code to check this first,
based on the order of precedence actually used by Qt.
Task-number: QTBUG-73574
Change-Id: I7b140dcac758ff37340fd7539f5cacb2982ff7aa
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Now it should always be possible to do
import QtGraphicalEffects 1.m
where m is Qt's minor version.
[ChangeLog][Qt Graphical Effects] In Qt 5.12 and newer versions, this
module is available with the same minor version as the Qt release
minor version number. For example import QtGraphicalEffects 1.12 will
work in Qt 5.12, even though there has been no API change, and the
maximum possible import version will automatically increment in future
Qt versions. This is intended to reduce confusion.
Change-Id: I4fa13fa9a662933161ff726a3e2ba586b2f7f6ff
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Currently, source items that set smooth to false will have blurry
effects when using layer.effect. Fix that by setting the interpolation
property of each effect's SourceProxy.
Standalone effects seem to work fine already.
The patch adds a manual testcase: "smooth". This can be used to verify
that the functionality works in the future, as adding an auto test
is not really possible.
This isn't done for all effects, as it doesn't make sense for all of
them (blurs, for example).
Task-number: QTBUG-67382
Change-Id: Ic6f030090cd0579dd4259ebafc9c99a8b9940494
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
|
|
|
|
|
|
|
|
| |
Makes it possible to see all effects instantly without having to resize
the window manually.
Change-Id: I72497be73979b410ac57b3a089715237e98d5017
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
|
|
|
|
|
|
|
| |
Otherwise failed QVERIFYs, etc. will result in leaked memory.
Change-Id: I0a48f62a28ebaa04a856a4b772f5ff98def4f171
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 247f19f08adfa287e9c5493ce8ffc2e3db260956.
QtDeclarative was fixed with 781caafe1fde71b059c0e3a42bda77ce0d7e4c2a
and tests pass now.
Task-number: QTBUG-65521
Change-Id: I43b2cd4be334248f35bbcf1403e668cb21129421
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-65204
Change-Id: I4fa090f6557f893e5bada9a73896aba47d9e7959
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
|
|
|
|
|
|
|
|
| |
[ChangeLog][Qt Graphical Effects] Added QtGraphicalEffects support for
OpenGL Core profile contexts.
Task-number: QTBUG-42107
Change-Id: I7111e2e6fb3a0b0391e76a17a8d091d288bfcc23
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Remove unused old license files
- Unify licensing
* Tools and tests are nowdays licensed under GPL-EXCEPT, update
correct license header to those
* Src is nowdays licensed under LGPL, update correct license
header to there
Task-number: QTBUG-57147
Change-Id: I9664c854108ca7c1e0be02fdae9e8d7c480dfd4c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|\
| |
| |
| | |
Change-Id: Iafd3a05a5a2a47252f5ee0724ec0362f8b841124
|
| |
| |
| |
| |
| |
| |
| |
| | |
Subjects each *.png file that matched grep -law "sRGB" to:
pngcrush -ow -brute -rem allb -reduce
Change-Id: I21879d6d43c610ebee074bd12417d9d5ebc69096
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Ia67a352bb51848428f8b907629c70ed340b57d78
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The logic had several flaws, including not respecting sourceRect
and wanted interpolation, so do it over.
Change-Id: I40b147a0e18ef5f9f3a0086904f9e9f93463c7fc
Task-number: QTBUG-47749
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
|
|/
|
|
|
|
|
|
|
|
|
| |
From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some
exceptions, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one
(in those files which will be under GPL 3 with exceptions)
Change-Id: I958a4fa8bb2ed83873045dac405d02659fc4f71a
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
|
|
|
|
|
|
| |
The tests was depending on a buggy behavior (QTBUG-37851)
Change-Id: I238ff02a3ac4cdb4690b5233603f7cb4db3ef422
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: Icf416b5db2cf9dbb0be29fc0e3b9a855c58035e3
Task-number: QTBUG-48625
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
This allows us to sanity-check future changes. The newly added
checks are expected to fail until QTBUG-48625 is fixed.
Change-Id: I9d505ee83ce774a13334c9d2e3c03baea0862237
Task-number: QTBUG-48625
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Running graphics and QML files would just be asking for trouble.
Change-Id: I36ae4d060d1794f572230b04d1b1d4de30ed80e8
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
Though this makes DropShadows work out of the box and
be less confusing to users, it also ends up breaking code
that uses DropShadow as a glow effect.
Change-Id: Id65dc85d2877709f3bd8d036f06c7b8fc2886777
Task-number: QTBUG-47749
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Iff577c9400cf2b3de9b97c8b898b4c971a2b9514
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I27c405af55384b5ea9a5c823bfed9fb5e8ba2161
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In the old SourceProxy implementation, layer.enabled = true that the
layer was used without a shader source in between. However, since
effects like Blur and DropShadow requires updates to sourceRect and
such, the effects would not work properly.
Since the usecase for layers is primarily to combine it with
layer.effect, we configure the layer.
[ChangeLog] When applying an effect to Item::layer.effect, the effect
will update the layer properties to make the effect work, such as
'smooth' to 'true' and changing 'sourceRect' to take
'transparentBorder' into account.
Change-Id: Idd68b025ade46c0b84142b2afb244730bed863d2
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This gives us a bit better control in terms of what we
want to check for. It should also fix some subtle bugs
when layer and ShaderEffectSource is used as input.
Change-Id: I29de13598811623c31563ac6e88f070aee0bab54
Task-number: QTBUG-40849
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
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: I8983b05749d75b438a314e7f385a85c612a04f6f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL
Change-Id: I452f44a464e8da80ee4c0c38de6ec6abfd6ac285
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Make the test find the 'QtGraphicalEffects' import under
Qml2ImportsPath (QML 2.x) instead of ImportsPath (QML 1.x)
when the source code is not available.
This seems to have worked so far because the source code is always
available in the CI machines, but it fails on devices where is not.
Change-Id: I475ccd5431d5e7c3adf239b1158d7bb67e0bc042
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
|
|
|
|
|
|
| |
Change-Id: Idaf2ac8f4dc2a8586c6e148bd67a33e9bdd677e1
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
| |
Change-Id: I8c00ae2974c9697602214a0e46df98b86adbf35c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I06d9e8f818910ab9243afb73087f187a4b3b05f4
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
| |
Use QtQml instead.
Change-Id: I88479de928a358a521efded01c68ac2c37f953bb
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
|
|
|
|
|
|
|
|
| |
Effect internal cache was incorreclty sized according to parent,
not shaderItem as it should be.
Change-Id: I7d9c8c034b9c0e4f5a8f65c223cd0b82ed807691
Reviewed-by: Kim Gronholm <kim.1.gronholm@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Tests should be working both before and after `make install'.
Adjust this test so it can load QtGraphicalEffects either from the
source tree or the install tree.
This code already attempted to accomplish this:
engine.addImportPath("../../src");
It didn't work, since the directory in the source tree is named
"effects" and not "QtGraphicalEffects". It also would not work when
the build tree and source tree are different.
Change-Id: Ied964714d72e041caa937a4204668fe4f86da3f5
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
|
|
|
|
|
|
|
| |
lenght -> length
Change-Id: I406995cad6992e5f48e38ebcb6d94cfae2a1b9db
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
If errors occur, include them in the test failure message.
Verify that the component is ready before calling create().
Remove unnecessary QTest::qWait().
Change-Id: I6a63bafed859ab564c3e3fc7a044ac998e079fea
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
|
|
|
|
|
| |
Change-Id: I210c10369f97ab8289bff3c3d7e6dc26d9215936
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
|
|
|
|
|
| |
Change-Id: I2e46eeed1e966cb3677f12e9bfab6ec6598eb91e
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
|
| |
|
| |
|