From e3c64aff6579f04353608d4b218f031d9137d3f4 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 17 Mar 2020 10:10:12 +0100 Subject: qsgrhisupport.cpp: Fix warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit scenegraph/qsgrhisupport.cpp: In member function ‘void QSGRhiSupport::applySettings()’: warning: ‘QSting::QString(const QByteArray&)’ is deprecated scenegraph/qsgrhisupport.cpp:161:102: note: in expansion of macro ‘qPrintable’ scenegraph/qsgrhisupport.cpp:585:112: warning: ‘void QAbstractSocket::error(QAbstractSocket::SocketError)’ is deprecated Change-Id: I848e089f9d6d26fcb7f44e9e83883f5f971eba3e Reviewed-by: Laszlo Agocs --- src/quick/scenegraph/qsgrhisupport.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/quick/scenegraph/qsgrhisupport.cpp') diff --git a/src/quick/scenegraph/qsgrhisupport.cpp b/src/quick/scenegraph/qsgrhisupport.cpp index cf30cb3f9a..29671f8a10 100644 --- a/src/quick/scenegraph/qsgrhisupport.cpp +++ b/src/quick/scenegraph/qsgrhisupport.cpp @@ -157,8 +157,10 @@ void QSGRhiSupport::applySettings() } else if (rhiBackend == QByteArrayLiteral("null")) { m_rhiBackend = QRhi::Null; } else { - if (!rhiBackend.isEmpty()) - qWarning("Unknown key \"%s\" for QSG_RHI_BACKEND, falling back to default backend.", qPrintable(rhiBackend)); + if (!rhiBackend.isEmpty()) { + qWarning("Unknown key \"%s\" for QSG_RHI_BACKEND, falling back to default backend.", + rhiBackend.constData()); + } #if defined(Q_OS_WIN) m_rhiBackend = QRhi::D3D11; #elif defined(Q_OS_MACOS) || defined(Q_OS_IOS) @@ -580,7 +582,7 @@ void QSGRhiProfileConnection::initialize(QRhi *rhi) profPort = 30667; qCDebug(QSG_LOG_INFO, "Sending RHI profiling output to %s:%d", qPrintable(profHost), profPort); m_profConn.reset(new QTcpSocket); - QObject::connect(m_profConn.data(), QOverload::of(&QAbstractSocket::error), m_profConn.data(), + QObject::connect(m_profConn.data(), &QAbstractSocket::errorOccurred, m_profConn.data(), [this](QAbstractSocket::SocketError socketError) { qWarning(" RHI profiler error: %d (%s)", socketError, qPrintable(m_profConn->errorString())); }); m_profConn->connectToHost(profHost, profPort); -- cgit v1.2.3