diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-05-08 14:06:53 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-05-21 09:58:01 +0100 |
| commit | 5596989f92fd36615e203215ef274bff80bb7e31 (patch) | |
| tree | 1a4839f02e0e6b019472897c248c1980413bb9eb | |
| parent | 59a26532aaf57c9b6e28a0795c0a1c4d12bb0134 (diff) | |
Remove deprecated API and update dependencies
Change-Id: I356ecc14fdcbe121378f82d625a641d03c05be6d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | dependencies.yaml | 9 | ||||
| -rw-r--r-- | src/quick3d/quick3d/qt3dquick_global.cpp | 1 | ||||
| -rw-r--r-- | src/quick3d/quick3d/qt3dquickvaluetypes.cpp | 7 | ||||
| -rw-r--r-- | src/quick3d/quick3d/qt3dquickvaluetypes_p.h | 5 |
4 files changed, 6 insertions, 16 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index d1427de69..71bb27906 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,16 @@ dependencies: ../qtbase: - ref: ae7e701074be97130aa45f780e2456981850b432 + ref: e1cab870cbb9672e29aa713816e8dd8d2b15f024 required: true ../qtdeclarative: - ref: dfa51b69bf1f7a6bb3acc0b5cf406039a9e05e83 + ref: 36ac9ab322d00ad8a2139bcf463275e3121bfb1f required: false # ../qtgamepad: # ref: fb20a2012e650917e294d1614ec17d3b01404b25 # required: false ../qtimageformats: - ref: 1623018a0c9665fbc18b081f932600e28502b679 + ref: dae70df509ef331aec684ae7d34891794a9aac7a required: false + ../qtshadertools: + ref: 0c1fbb42115ed37938c2cde53ef2345c1c0b1d42 + required: true diff --git a/src/quick3d/quick3d/qt3dquick_global.cpp b/src/quick3d/quick3d/qt3dquick_global.cpp index 6b34f3719..a74898a42 100644 --- a/src/quick3d/quick3d/qt3dquick_global.cpp +++ b/src/quick3d/quick3d/qt3dquick_global.cpp @@ -697,7 +697,6 @@ static QQmlPrivate::AutoParentResult qquick3ditem_autoParent(QObject *obj, QObje void Quick3D_initialize() { - Qt3DCore::Quick::Quick3DValueTypes::registerValueTypes(); QQml_addValueTypeProvider(getValueTypeProvider()); QQml_setColorProvider(getColorProvider()); QAbstractNodeFactory::registerNodeFactory(QuickNodeFactory::instance()); diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp index 7cc1a4a0c..5946fa4d4 100644 --- a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp +++ b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp @@ -45,13 +45,6 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { namespace Quick { -namespace Quick3DValueTypes { - void registerValueTypes() - { - QQmlValueTypeFactory::registerValueTypes("Qt3D.Core", 2, 0); - } -} - QString Quick3DColorValueType::toString() const { return v.name(v.alpha() != 255 ? QColor::HexArgb : QColor::HexRgb); diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes_p.h b/src/quick3d/quick3d/qt3dquickvaluetypes_p.h index ab98771d3..4b6f08393 100644 --- a/src/quick3d/quick3d/qt3dquickvaluetypes_p.h +++ b/src/quick3d/quick3d/qt3dquickvaluetypes_p.h @@ -66,11 +66,6 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { namespace Quick { -namespace Quick3DValueTypes { - -Q_3DQUICKSHARED_PRIVATE_EXPORT void registerValueTypes(); - -} class Q_3DQUICKSHARED_PRIVATE_EXPORT Quick3DColorValueType { |