From abab1660aa99cc0f7e7acacd9a3fb51da4f9feca Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 15 Feb 2021 11:24:27 +0100 Subject: [PATCH] Define -DQT_NO_CAST_TO_ASCII and fix compilation --- CMakeLists.txt | 2 +- src/plugins/platforms/virtual/virtual_output.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c09abdd353..532ab10165 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,7 @@ include(ECMOptionalAddSubdirectory) include(ECMConfiguredInstall) include(ECMQtDeclareLoggingCategory) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0 -DQT_USE_QSTRINGBUILDER -DQT_NO_URL_CAST_FROM_STRING) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0 -DQT_USE_QSTRINGBUILDER -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_TO_ASCII) # Prevent EGL headers from including platform headers, in particular Xlib.h. add_definitions(-DMESA_EGL_NO_X11_HEADERS) diff --git a/src/plugins/platforms/virtual/virtual_output.cpp b/src/plugins/platforms/virtual/virtual_output.cpp index b8e47d2b82..4a1746f884 100644 --- a/src/plugins/platforms/virtual/virtual_output.cpp +++ b/src/plugins/platforms/virtual/virtual_output.cpp @@ -53,10 +53,10 @@ void VirtualOutput::init(const QPoint &logicalPosition, const QSize &pixelSize) mode.size = pixelSize; mode.flags = KWaylandServer::OutputDeviceInterface::ModeFlag::Current; mode.refreshRate = refreshRate; - initInterfaces(QByteArray("model_").append(QString::number(m_identifier)), - QByteArray("manufacturer_").append(QString::number(m_identifier)), - QByteArray("UUID_").append(QString::number(m_identifier)), - pixelSize, { mode }, QByteArray("EDID_").append(QString::number(m_identifier))); + initInterfaces(QByteArray("model_").append(QByteArray::number(m_identifier)), + QByteArray("manufacturer_").append(QByteArray::number(m_identifier)), + QByteArray("UUID_").append(QByteArray::number(m_identifier)), + pixelSize, { mode }, QByteArray("EDID_").append(QByteArray::number(m_identifier))); setGeometry(QRect(logicalPosition, pixelSize)); }