From e7d06759b50f78a5b7dc96801e42760b22270e4d Mon Sep 17 00:00:00 2001 From: Lukas W Date: Fri, 1 Sep 2017 14:26:46 +0200 Subject: [PATCH] Fix Qt4 VST embed option --- plugins/CMakeLists.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index b77f3e5f2..e010b11e8 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -36,12 +36,21 @@ IF(LMMS_MINIMAL) ENDIF() OPTION(LMMS_EMBED_VST "Turn on to embed VSTs as subwindows. Turn off to open VSTs in separate windows." ON) -OPTION(LMMS_EMBED_VST_X11 "Turn on to embed VSTs using the X11Embed protocol. Turn off to use Qt's own embedding, which may be broken with your Qt version." ON) + +IF(WANT_QT5) + OPTION(LMMS_EMBED_VST_X11 "Turn on to embed VSTs using the X11Embed protocol. Turn off to use Qt's own embedding, which may be broken with your Qt version." ON) +ENDIF() IF(NOT LMMS_EMBED_VST OR NOT LMMS_BUILD_LINUX) SET(LMMS_EMBED_VST_X11 OFF) ENDIF() +# Qt4 has no QWindow::createWindowContainer, so we always use QX11EmbedContainer +IF(LMMS_EMBED_VST AND NOT WANT_QT5) + SET(LMMS_EMBED_VST_X11 ON) +ENDIF() + + IF("${PLUGIN_LIST}" STREQUAL "") SET(PLUGIN_LIST ${MINIMAL_LIST}