diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-02-14 11:06:28 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-02-17 09:48:50 +0100 |
| commit | ebb48fa6be3aeae6915da7ec30311a0e439a0720 (patch) | |
| tree | 396315936ca29687fffa3b40eff8a62c70f76b42 /src | |
| parent | 2dd285bc2852ce7bf6d63dea33996482ad2fcd41 (diff) | |
Fix deprecation warnings
colorgradient.cpp:80:61: warning: ‘QQmlListProperty<T>::QQmlListProperty(QObject*, QList<T*>&) [with T = QtDataVisualization::ColorGradientStop]’ is deprecated: Use constructor taking QList pointer, and gain improved performance [-Wdeprecated-declarations]
declarativerendernode.cpp:116:71: warning: ‘QSGTexture* QQuickWindow::createTextureFromId(uint, const QSize&, QQuickWindow::CreateTextureOptions) const’ is deprecated: Use createTextureFromNativeObject() instead [-Wdeprecated-declarations]
customformatter.cpp:167:34: warning: ‘QDateTime::QDateTime(const QDate&)’ is deprecated: Use QDate::startOfDay() [-Wdeprecated-declarations]
Change-Id: Iaf3b8814cd70a704b87b4970ad83ed5a7d4dc0f1
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/datavisualizationqml2/colorgradient.cpp | 2 | ||||
| -rw-r--r-- | src/datavisualizationqml2/declarativerendernode.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/datavisualizationqml2/colorgradient.cpp b/src/datavisualizationqml2/colorgradient.cpp index 125b9545..edcca2ec 100644 --- a/src/datavisualizationqml2/colorgradient.cpp +++ b/src/datavisualizationqml2/colorgradient.cpp @@ -77,7 +77,7 @@ ColorGradient::~ColorGradient() QQmlListProperty<ColorGradientStop> ColorGradient::stops() { - return QQmlListProperty<ColorGradientStop>(this, m_stops); + return QQmlListProperty<ColorGradientStop>(this, &m_stops); } void ColorGradient::doUpdate() diff --git a/src/datavisualizationqml2/declarativerendernode.cpp b/src/datavisualizationqml2/declarativerendernode.cpp index 1e3c3542..eac1a36b 100644 --- a/src/datavisualizationqml2/declarativerendernode.cpp +++ b/src/datavisualizationqml2/declarativerendernode.cpp @@ -113,7 +113,10 @@ void DeclarativeRenderNode::updateFBO() QRectF(0, 1, 1, -1)); delete m_texture; - m_texture = m_window->createTextureFromId(m_fbo->texture(), m_size); + const uint id = m_fbo->texture(); + m_texture = + m_window->createTextureFromNativeObject(QQuickWindow::NativeObjectTexture, + &id, 0 /* nativeLayout */, m_size); m_material.setTexture(m_texture); m_materialO.setTexture(m_texture); |