diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-07-01 14:11:34 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-07-03 02:29:44 +0000 |
| commit | 98a71c7739a91be03b73312253dd1291e0a1d96d (patch) | |
| tree | 50fb8f5d28e29f79288771d66686203c985a3423 /src/quick/items/qquickgenericshadereffect.cpp | |
| parent | 441e0b41bf5b700cdaa3b0ba2393c487ed4b9de5 (diff) | |
Suppress warning about QSignalMapper being deprecated
It is since qtbase commit 29bcbeab90210da80234529905d17280374f9684.
Change-Id: I8d96dea9955d4c749b99fffd14cd512a8ff88a74
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/quick/items/qquickgenericshadereffect.cpp')
| -rw-r--r-- | src/quick/items/qquickgenericshadereffect.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/items/qquickgenericshadereffect.cpp b/src/quick/items/qquickgenericshadereffect.cpp index b366071962..305ef7e778 100644 --- a/src/quick/items/qquickgenericshadereffect.cpp +++ b/src/quick/items/qquickgenericshadereffect.cpp @@ -546,7 +546,10 @@ void QQuickGenericShaderEffect::updateShaderVars(Shader shaderType) // Have a QSignalMapper that emits mapped() with an index+type on each property change notify signal. auto &sm(m_signalMappers[shaderType][i]); if (!sm.mapper) { +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED sm.mapper = new QSignalMapper; +QT_WARNING_POP sm.mapper->setMapping(m_item, i | (shaderType << 16)); } sm.active = true; |