yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Define -DQT_NO_CAST_TO_ASCII and fix compilation

Browse source
This commit is contained in:
David Faure 2021-02-15 11:24:27 +01:00 committed by Vlad Zahorodnii
parent c6b638267a
commit abab1660aa
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -49,7 +49,7 @@ include(ECMOptionalAddSubdirectory)
include(ECMConfiguredInstall) include(ECMConfiguredInstall)
include(ECMQtDeclareLoggingCategory) 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. # Prevent EGL headers from including platform headers, in particular Xlib.h.
add_definitions(-DMESA_EGL_NO_X11_HEADERS) add_definitions(-DMESA_EGL_NO_X11_HEADERS)

8
src/plugins/platforms/virtual/virtual_output.cpp
View file

@ -53,10 +53,10 @@ void VirtualOutput::init(const QPoint &logicalPosition, const QSize &pixelSize)
mode.size = pixelSize; mode.size = pixelSize;
mode.flags = KWaylandServer::OutputDeviceInterface::ModeFlag::Current; mode.flags = KWaylandServer::OutputDeviceInterface::ModeFlag::Current;
mode.refreshRate = refreshRate; mode.refreshRate = refreshRate;
initInterfaces(QByteArray("model_").append(QString::number(m_identifier)), initInterfaces(QByteArray("model_").append(QByteArray::number(m_identifier)),
QByteArray("manufacturer_").append(QString::number(m_identifier)), QByteArray("manufacturer_").append(QByteArray::number(m_identifier)),
QByteArray("UUID_").append(QString::number(m_identifier)), QByteArray("UUID_").append(QByteArray::number(m_identifier)),
pixelSize, { mode }, QByteArray("EDID_").append(QString::number(m_identifier))); pixelSize, { mode }, QByteArray("EDID_").append(QByteArray::number(m_identifier)));
setGeometry(QRect(logicalPosition, pixelSize)); setGeometry(QRect(logicalPosition, pixelSize));
} }