Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
KWin
Commits
abab1660
Commit
abab1660
authored
Feb 15, 2021
by
David Faure
Committed by
Vlad Zahorodnii
Feb 19, 2021
Browse files
Define -DQT_NO_CAST_TO_ASCII and fix compilation
parent
c6b63826
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
abab1660
...
...
@@ -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
)
...
...
src/plugins/platforms/virtual/virtual_output.cpp
View file @
abab1660
...
...
@@ -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
(
Q
String
::
number
(
m_identifier
)),
QByteArray
(
"manufacturer_"
).
append
(
Q
String
::
number
(
m_identifier
)),
QByteArray
(
"UUID_"
).
append
(
Q
String
::
number
(
m_identifier
)),
pixelSize
,
{
mode
},
QByteArray
(
"EDID_"
).
append
(
Q
String
::
number
(
m_identifier
)));
initInterfaces
(
QByteArray
(
"model_"
).
append
(
Q
ByteArray
::
number
(
m_identifier
)),
QByteArray
(
"manufacturer_"
).
append
(
Q
ByteArray
::
number
(
m_identifier
)),
QByteArray
(
"UUID_"
).
append
(
Q
ByteArray
::
number
(
m_identifier
)),
pixelSize
,
{
mode
},
QByteArray
(
"EDID_"
).
append
(
Q
ByteArray
::
number
(
m_identifier
)));
setGeometry
(
QRect
(
logicalPosition
,
pixelSize
));
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment