diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2019-02-08 18:03:54 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2019-02-09 17:05:29 +0000 |
| commit | 306bc79ec33eb9130049cd124673a1e90a8232e6 (patch) | |
| tree | 8f5e2f07f812ba446dc6890e51935e559030d1cc /src | |
| parent | 1cd01247e07e39209989fd4232be5f91faa2c549 (diff) | |
Suppress warning about deprecated class QTexturedMetalRoughMaterial
We have to use it in order to register with QML.
qt3dquick3dextrasplugin.cpp:116:33: warning: ‘QTexturedMetalRoughMaterial’ is deprecated: Use Qt3DExtras::QMetalRoughMaterial [-Wdeprecated-declarations]
Change-Id: Id061f35c088044b69a15fffd15818fc7a9bbe6df
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp index 65b8863a1..91ec85795 100644 --- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp @@ -113,7 +113,10 @@ void Qt3DQuick3DExtrasPlugin::registerTypes(const char *uri) qmlRegisterType<Qt3DExtras::QDiffuseSpecularMaterial>(uri, 2, 10, "DiffuseSpecularMaterial"); qmlRegisterType<Qt3DExtras::QMetalRoughMaterial>(uri, 2, 9, "MetalRoughMaterial"); qmlRegisterType<Qt3DExtras::QMetalRoughMaterial, 10>(uri, 2, 10, "MetalRoughMaterial"); +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED qmlRegisterType<Qt3DExtras::QTexturedMetalRoughMaterial>(uri, 2, 9, "TexturedMetalRoughMaterial"); +QT_WARNING_POP qmlRegisterType<Qt3DExtras::QMorphPhongMaterial>(uri, 2, 9, "MorphPhongMaterial"); qmlRegisterType<Qt3DExtras::QSpriteGrid>(uri, 2, 10, "SpriteGrid"); |