diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-02-26 19:56:54 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-02-27 14:19:24 +0000 |
| commit | 9c7e55958716de86387d11de0295435d61adfece (patch) | |
| tree | 37b590f1e51f0190def5dcf7f51f50bc5a7323fe /src/quick3d/imports | |
| parent | 2e97cde1dd6f0dec7ee36df8d02527b955597e07 (diff) | |
Remove more deprecated code
Change-Id: I14695a93c4dc1b54c5ebc149b0fde0d328d75d7b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d/imports')
| -rw-r--r-- | src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp index 707824182..515f9545c 100644 --- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp @@ -71,7 +71,6 @@ #include <Qt3DExtras/qspritesheetitem.h> #include <Qt3DExtras/qtext2dentity.h> #include <Qt3DExtras/qtexturematerial.h> -#include <Qt3DExtras/qtexturedmetalroughmaterial.h> #include <Qt3DExtras/qtorusgeometry.h> #include <Qt3DExtras/qtorusmesh.h> @@ -115,11 +114,6 @@ 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"); qmlRegisterType<Qt3DExtras::QSpriteSheetItem>(uri, 2, 10, "SpriteItem"); |