Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle signature changes for nativeEventFilter for qt6 #7254

Merged
merged 78 commits into from
May 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
42a2f19
refactored gui_templates.h
Rossmaxx Mar 24, 2024
573177a
experimental qt6 support enabled
Rossmaxx Mar 24, 2024
9143a05
oops
Rossmaxx Mar 24, 2024
f3aaeb5
added some qt6 flags
Rossmaxx Mar 24, 2024
3dad2b8
remotevst
Rossmaxx Mar 24, 2024
1a11e9c
missed this on src/cmakelist
Rossmaxx Mar 24, 2024
9ca4132
fixup lmms_wrap_cpp and lmms_wrap_ui
Rossmaxx Mar 27, 2024
eebe551
another minor one
Rossmaxx Mar 27, 2024
ef13bcb
bump up minor version
Rossmaxx Mar 27, 2024
a596216
generation success
Rossmaxx Mar 28, 2024
5bc0cf9
Revert "refactored gui_templates.h"
Rossmaxx Mar 28, 2024
72a7985
Merge branch 'LMMS:master' into experiment-qt6
Rossmaxx Mar 28, 2024
5f7530c
remove the useless QTDIR variable
Rossmaxx Mar 28, 2024
09de46e
does this fix it?
Rossmaxx Mar 28, 2024
a2d83dc
added status check for qt6
Rossmaxx Mar 30, 2024
aa22ef5
alignment
Rossmaxx Mar 30, 2024
e8119ea
Merge branch 'LMMS:master' into experiment-qt6
Rossmaxx Mar 30, 2024
f79b490
status_vst
Rossmaxx Mar 30, 2024
c77b93b
Merge branch 'master' into experiment-qt6
Rossmaxx Apr 6, 2024
74f1835
replace qt5_wrap_ui with cmake_autouic
Rossmaxx Apr 8, 2024
46bd6b7
moved ui files
Rossmaxx Apr 8, 2024
9470abc
Merge branch 'remove-qt5-wrap-ui' into experiment-qt6
Rossmaxx Apr 10, 2024
bba21f9
try to fix the rcc error
Rossmaxx Apr 10, 2024
faae414
rpmalloc
Rossmaxx Apr 10, 2024
46fdf26
declare cpp 17 explicitly
Rossmaxx Apr 10, 2024
5bd8290
reorder cpp 17 call
Rossmaxx Apr 10, 2024
5057356
temp
Rossmaxx Apr 10, 2024
bfb438b
lmmsobjs
Rossmaxx Apr 10, 2024
1bee307
permissive
Rossmaxx Apr 10, 2024
74712d3
quotes
Rossmaxx Apr 10, 2024
6b8ec51
cleanup
Rossmaxx Apr 10, 2024
8d78274
Merge branch 'master' of https://github.com/Rossmaxx/lmms into experi…
Rossmaxx Apr 10, 2024
9d85660
Revert unnecessary autoui changes
Rossmaxx Apr 10, 2024
853cffa
Revert "does this fix it?"
Rossmaxx Apr 10, 2024
263cfa8
try to use older cmake
Rossmaxx Apr 10, 2024
077dfa4
Revert "reorder cpp 17 call"
Rossmaxx Apr 10, 2024
f8284e8
freeboy
Rossmaxx Apr 10, 2024
753b2a9
made comment clearer
Rossmaxx Apr 10, 2024
1d6a892
try removing the explicit call
Rossmaxx Apr 10, 2024
bb4d04b
Make the minimum code compile for Qt6
michaelgregorius Apr 11, 2024
52689c3
Qt 5 support
Rossmaxx Apr 13, 2024
3a83aea
Fix Qt5 build for ControlLayout
michaelgregorius Apr 13, 2024
2e736ec
Prepare LadspaMatrixControlDialog for Qt6
michaelgregorius Apr 13, 2024
835310e
CMakeLists.txt adjustments for Qt6
michaelgregorius Apr 13, 2024
c262ac2
force qt 5 on vst for now
Rossmaxx Apr 14, 2024
ea8f8c3
Switch to "using" instead of "typedef"
michaelgregorius Apr 14, 2024
9085f05
Merge branch 'master' into experiment-qt6
Rossmaxx Apr 20, 2024
6f85e45
cleanup qt5compat finding code
Rossmaxx Apr 20, 2024
684afdb
Fix build
michaelgregorius Apr 20, 2024
c456470
Fix warnings in AutomationClip.cpp
michaelgregorius Apr 20, 2024
820a88e
Fix warning in AutomationClipView
michaelgregorius Apr 20, 2024
66ec096
Fix deprecated usage of x() and y() methods
michaelgregorius Apr 20, 2024
f2638ae
Fix more iterator operator warnings
michaelgregorius Apr 20, 2024
0f83043
Fix QKeyCombination warning
michaelgregorius Apr 20, 2024
70ede88
added minimum version check
Rossmaxx Apr 24, 2024
2abe82a
Merge branch 'LMMS:master' into experiment-qt6
Rossmaxx Apr 24, 2024
7161377
style changes
Rossmaxx Apr 24, 2024
1906ea5
zyn build fix for msvc qt6
Rossmaxx Apr 24, 2024
2209c3e
forgot to rename to zyn
Rossmaxx Apr 24, 2024
cf40e74
finally fixed zyn for msvc
Rossmaxx Apr 24, 2024
2bd862a
Add experimental Qt 6 support flags. (#7182)
Rossmaxx Apr 25, 2024
52c15d3
Merge remote-tracking branch 'upstream/master' into qt6
DomClark Apr 27, 2024
d08d6ba
Fix Qt6 DMG on Apple (#7240)
tresf May 7, 2024
ae031ad
pulled from upstream qt6
Rossmaxx May 13, 2024
faada51
fixup nativeEventFilter on windows
Rossmaxx May 13, 2024
bd82ca7
check namespace
Rossmaxx May 13, 2024
ad8ff79
fix typecast
Rossmaxx May 13, 2024
320d03a
fixed dom's comment
Rossmaxx May 17, 2024
e973864
headers
Rossmaxx May 17, 2024
118efbd
Merge branch 'qt6' into experiment-qt6
tresf May 17, 2024
d3fee47
Fix formatting after rebase
tresf May 17, 2024
5cbb349
Addressed code review
Rossmaxx May 18, 2024
0858a4d
fixed dom's comment
Rossmaxx May 17, 2024
d8e614d
headers
Rossmaxx May 17, 2024
516128c
win32EventFilter
Rossmaxx May 19, 2024
f9e9af6
botched git so had to copy paste again
Rossmaxx May 19, 2024
87c7518
missed the header again
Rossmaxx May 19, 2024
54258ff
Missed function call
Rossmaxx May 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions include/MainApplication.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,14 @@ class MainApplication : public QApplication
MainApplication(int& argc, char** argv);
bool event(QEvent* event) override;
#ifdef LMMS_BUILD_WIN32
bool winEventFilter(MSG* msg, long* result);
bool nativeEventFilter(const QByteArray& eventType, void* message,
long* result);
#endif
#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
using FilterResult = long;
#else
using FilterResult = qintptr;
#endif // QT6 check
bool win32EventFilter(MSG* msg, FilterResult* result);
bool nativeEventFilter(const QByteArray& eventType, void* message, FilterResult* result);
#endif // LMMS_BUILD_WIN32
inline QString& queuedFile()
{
return m_queuedFile;
Expand Down
8 changes: 4 additions & 4 deletions src/gui/MainApplication.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ bool MainApplication::event(QEvent* event)
}

#ifdef LMMS_BUILD_WIN32
// This can be moved into nativeEventFilter once Qt4 support has been dropped
bool MainApplication::winEventFilter(MSG* msg, long* result)
// Helper function for nativeEventFilter
bool MainApplication::win32EventFilter(MSG* msg, FilterResult* result)
{
switch(msg->message)
{
Expand All @@ -110,11 +110,11 @@ bool MainApplication::winEventFilter(MSG* msg, long* result)
}

bool MainApplication::nativeEventFilter(const QByteArray& eventType,
void* message, long* result)
void* message, FilterResult* result)
{
if(eventType == "windows_generic_MSG")
{
return winEventFilter(static_cast<MSG *>(message), result);
return win32EventFilter(static_cast<MSG*>(message), result);
}
return false;
}
Expand Down
Loading