noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into zneix/feature/qt6

Browse source
This commit is contained in:
zneix 2021-07-30 20:11:35 +02:00
parent 023149a023 986b2937d7
commit 1520398984
No known key found for this signature in database
GPG key ID: 911916E0523B22F6
3 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/libcommuni

@ -1 +1 @@
Subproject commit a196c53829f304b854ae79a770ce537b953a8e60 Subproject commit c613600e6a52e6d3166247a05205cf1c755d4868

4
src/widgets/BaseWindow.cpp
View file

@ -641,11 +641,7 @@ bool BaseWindow::nativeEvent(const QByteArray &eventType, void *message,
qintptr *result) qintptr *result)
{ {
#ifdef USEWINSDK #ifdef USEWINSDK
# if (QT_VERSION == QT_VERSION_CHECK(5, 11, 1))
MSG *msg = *reinterpret_cast<MSG **>(message);
# else
MSG *msg = reinterpret_cast<MSG *>(message); MSG *msg = reinterpret_cast<MSG *>(message);
# endif
bool returnValue = false; bool returnValue = false;

4
src/widgets/FramelessEmbedWindow.cpp
View file

@ -30,11 +30,7 @@ FramelessEmbedWindow::FramelessEmbedWindow()
bool FramelessEmbedWindow::nativeEvent(const QByteArray &eventType, bool FramelessEmbedWindow::nativeEvent(const QByteArray &eventType,
void *message, long *result) void *message, long *result)
{ {
# if (QT_VERSION == QT_VERSION_CHECK(5, 11, 1))
MSG *msg = *reinterpret_cast<MSG **>(message);
# else
MSG *msg = reinterpret_cast<MSG *>(message); MSG *msg = reinterpret_cast<MSG *>(message);
# endif
if (msg->message == WM_COPYDATA) if (msg->message == WM_COPYDATA)
{ {