diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-28 13:52:09 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-28 13:53:41 +0200 |
| commit | 0e25e5402e765942d8db62ecf946b311ac7e6b9c (patch) | |
| tree | 47566c0c7762109b8ccdcae28294f9efcdbd103d /src/extras | |
| parent | f39178a415cb41470775a86e0aa358faa3686d81 (diff) | |
Fix some deprecation warnings
jobs/qaspectjobmanager.cpp:90:72: warning: 'T* QWeakPointer<T>::data() const [with T = Qt3DCore::QAspectJob]' is deprecated: Use toStrongRef() instead, and data() on the returned QSharedPointer [-Wdeprecated-declarations]
defaults/qtexturematerial.cpp:66:431: warning: 'QVariant qVariantFromValue(const T&) [with T = QGenericMatrix<3, 3, float>]' is deprecated: Use QVariant::fromValue() instead. [-Wdeprecated-declarations]
...
testpostmanarbiter.cpp:75:51: warning: 'static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = QSharedPointer<Qt3DCore::QSceneChange>]' is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations]
tst_qray3d.cpp:510:100: warning: 'QVariant qVariantFromValue(const T&) [with T = Qt3DRender::RayCasting::QRay3D]' is deprecated: Use QVariant::fromValue() instead. [-Wdeprecated-declarations]
tst_renderviewbuilder.cpp:331:120: warning: 'T* QWeakPointer<T>::data() const [with T = Qt3DCore::QAspectJob]' is deprecated: Use toStrongRef() instead, and data() on the returned QSharedPointer [-Wdeprecated-declarations]
...
Change-Id: I446f3ddeb7aa2c5698d2a976fa163b443e01cc0c
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/extras')
| -rw-r--r-- | src/extras/defaults/qtexturematerial.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/extras/defaults/qtexturematerial.cpp b/src/extras/defaults/qtexturematerial.cpp index 5545f2018..dca45fded 100644 --- a/src/extras/defaults/qtexturematerial.cpp +++ b/src/extras/defaults/qtexturematerial.cpp @@ -63,7 +63,7 @@ QTextureMaterialPrivate::QTextureMaterialPrivate() : QMaterialPrivate() , m_textureEffect(new QEffect) , m_textureParameter(new QParameter(QStringLiteral("diffuseTexture"), new QTexture2D)) - , m_textureTransformParameter(new QParameter(QStringLiteral("texCoordTransform"), qVariantFromValue(QMatrix3x3()))) + , m_textureTransformParameter(new QParameter(QStringLiteral("texCoordTransform"), QVariant::fromValue(QMatrix3x3()))) , m_textureGL3Technique(new QTechnique) , m_textureGL2Technique(new QTechnique) , m_textureES2Technique(new QTechnique) @@ -247,13 +247,13 @@ void QTextureMaterial::setTextureOffset(QVector2D textureOffset) QMatrix3x3 matrix = d->m_textureTransformParameter->value().value<QMatrix3x3>(); matrix(0, 2) = textureOffset.x(); matrix(1, 2) = textureOffset.y(); - d->m_textureTransformParameter->setValue(qVariantFromValue(matrix)); + d->m_textureTransformParameter->setValue(QVariant::fromValue(matrix)); } void QTextureMaterial::setTextureTransform(const QMatrix3x3 &matrix) { Q_D(QTextureMaterial); - d->m_textureTransformParameter->setValue(qVariantFromValue(matrix)); + d->m_textureTransformParameter->setValue(QVariant::fromValue(matrix)); } /*! |