From 0b6024b853da4122a427d1edd1e009d175b1b80a Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Mon, 27 Jan 2020 06:37:06 +0100 Subject: Doc: Fix typo in qdoc command Fixes: QTBUG-81676 Change-Id: Ibe7f73e1fc529411ca92d7bdbb2ad8824cb97a62 Reviewed-by: Venugopal Shivashankar Reviewed-by: Leena Miettinen --- src/datavisualization/engine/q3dbars.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp index daeedf3c..2f2cf63b 100644 --- a/src/datavisualization/engine/q3dbars.cpp +++ b/src/datavisualization/engine/q3dbars.cpp @@ -157,7 +157,7 @@ QBar3DSeries *Q3DBars::primarySeries() const * to the axes. If the newly added series has specified a selected bar, it will be highlighted and * any existing selection will be cleared. Only one added series can have an active selection. * - * /sa seriesList(), primarySeries + * \sa seriesList(), primarySeries */ void Q3DBars::addSeries(QBar3DSeries *series) { -- cgit v1.2.3 From ebb48fa6be3aeae6915da7ec30311a0e439a0720 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 14 Feb 2020 11:06:28 +0100 Subject: Fix deprecation warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit colorgradient.cpp:80:61: warning: ‘QQmlListProperty::QQmlListProperty(QObject*, QList&) [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 Reviewed-by: Laszlo Agocs --- src/datavisualizationqml2/colorgradient.cpp | 2 +- src/datavisualizationqml2/declarativerendernode.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src') 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 ColorGradient::stops() { - return QQmlListProperty(this, m_stops); + return QQmlListProperty(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); -- cgit v1.2.3