diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2020-06-08 13:01:04 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2020-06-10 06:02:04 +0200 |
| commit | bb906cecec40b7de6a39d97f7c07a883de40195d (patch) | |
| tree | c7fd7711bd24500ea4e5e941082504decad4f525 /src/quick/items/items.pri | |
| parent | 4fd3ad8c4689fc40c4ca549bba95632dc4d1a990 (diff) | |
| download | qtdeclarative-bb906cecec40b7de6a39d97f7c07a883de40195d.tar.gz | |
Remove QQuickGenericShaderEffect
Keep it as an internal class for now, with the name
QQuickShaderEffectImpl, and move it to qquickshadereffect.cpp.
In the long term, we want to get rid of the extra QObject, but that
requires careful untangling of the connections and the timing of
cleanup at destruction.
Task-number: QTBUG-83977
Change-Id: I6513bd0d8fc8522a15049b70ab43fc222088e7d0
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/quick/items/items.pri')
| -rw-r--r-- | src/quick/items/items.pri | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/quick/items/items.pri b/src/quick/items/items.pri index f514c306ff..c3f350809d 100644 --- a/src/quick/items/items.pri +++ b/src/quick/items/items.pri @@ -209,13 +209,11 @@ qtConfig(quick-shadereffect) { HEADERS += \ $$PWD/qquickshadereffectsource_p.h \ $$PWD/qquickshadereffectmesh_p.h \ - $$PWD/qquickshadereffect_p.h \ - $$PWD/qquickgenericshadereffect_p.h + $$PWD/qquickshadereffect_p.h SOURCES += \ $$PWD/qquickshadereffectsource.cpp \ $$PWD/qquickshadereffectmesh.cpp \ - $$PWD/qquickshadereffect.cpp \ - $$PWD/qquickgenericshadereffect.cpp + $$PWD/qquickshadereffect.cpp qtConfig(opengl) { OTHER_FILES += \ |