diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-16 10:35:21 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-16 10:35:21 +0200 |
| commit | cf2bf011ae0f33bed963d088f8267746a3369c4c (patch) | |
| tree | 12c244d7bbb9d1a75a15632292aa14bafeea0c42 /src/quick/items/qquickopenglshadereffect_p.h | |
| parent | 3fff03048a48aa7ead6e888165b2ae5a118d675c (diff) | |
| parent | 039071ea5e93d93deb0103e7c9488198dcce55d6 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I192cb06f3b92869699cb3e072f2c6c1e8dbb1ef4
Diffstat (limited to 'src/quick/items/qquickopenglshadereffect_p.h')
| -rw-r--r-- | src/quick/items/qquickopenglshadereffect_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickopenglshadereffect_p.h b/src/quick/items/qquickopenglshadereffect_p.h index 0c2adadc62..3087c1eb0b 100644 --- a/src/quick/items/qquickopenglshadereffect_p.h +++ b/src/quick/items/qquickopenglshadereffect_p.h @@ -89,7 +89,7 @@ struct Q_QUICK_PRIVATE_EXPORT QQuickOpenGLShaderEffectCommon ~QQuickOpenGLShaderEffectCommon(); - void disconnectPropertySignals(QQuickItem *item, Key::ShaderType shaderType); + void disconnectPropertySignals(QObject *item, Key::ShaderType shaderType); void connectPropertySignals(QQuickItem *item, const QMetaObject *itemMetaObject, Key::ShaderType shaderType); void updateParseLog(bool ignoreAttributes); void lookThroughShaderCode(QQuickItem *item, const QMetaObject *itemMetaObject, Key::ShaderType shaderType, const QByteArray &code); |