Fix VST effects embedding

plugins/CMakeLists.txt

@@ -50,6 +50,13 @@ IF(LMMS_EMBED_VST AND NOT WANT_QT5)
 	SET(LMMS_EMBED_VST_X11 ON)
 ENDIF()
 
+IF(LMMS_EMBED_VST)
+	SET(EMBED_FLAGS "-DLMMS_EMBED_VST")
+	IF(LMMS_EMBED_VST_X11)
+		LIST(APPEND EMBED_FLAGS "-DLMMS_EMBED_VST_X11")
+	ENDIF()
+ENDIF()
+
 
 IF("${PLUGIN_LIST}" STREQUAL "")
 	SET(PLUGIN_LIST

plugins/VstEffect/CMakeLists.txt

@@ -10,6 +10,8 @@ ELSE()
 	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
 ENDIF()
 
+ADD_DEFINITIONS(${EMBED_FLAGS})
+
 BUILD_PLUGIN(vsteffect VstEffect.cpp VstEffectControls.cpp VstEffectControlDialog.cpp VstSubPluginFeatures.cpp VstEffect.h VstEffectControls.h VstEffectControlDialog.h VstSubPluginFeatures.h MOCFILES VstEffectControlDialog.h VstEffectControls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
 SET_TARGET_PROPERTIES(vsteffect PROPERTIES COMPILE_FLAGS "-Wno-attributes")
 TARGET_LINK_LIBRARIES(vsteffect -lvstbase)

plugins/VstEffect/VstEffectControlDialog.cpp

@@ -240,9 +240,7 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) :
 						QSizePolicy::Fixed ), 1, 0 );
 		l->addWidget( resize, 2, 0, 1, 1, Qt::AlignCenter );
 #ifdef LMMS_EMBED_VST
-#if QT_VERSION < 0x050000
 		l->addWidget( m_pluginWidget, 3, 0, 1, 1, Qt::AlignCenter );
-#endif
 #endif
 		l->setRowStretch( 5, 1 );
 		l->setColumnStretch( 1, 1 );

plugins/vst_base/CMakeLists.txt

@@ -2,16 +2,8 @@ IF(LMMS_SUPPORT_VST)
 
 INCLUDE(BuildPlugin)
 
-IF(LMMS_EMBED_VST)
-    SET(EMBED_FLAGS "-DLMMS_EMBED_VST")
-    IF(LMMS_EMBED_VST_X11)
-        LIST(APPEND EMBED_FLAGS "-DLMMS_EMBED_VST_X11")
-    ENDIF()
-ENDIF()
-
 ADD_DEFINITIONS(${EMBED_FLAGS})
 
-
 IF(LMMS_BUILD_WIN32)
 	ADD_DEFINITIONS(-DPTW32_STATIC_LIB)
 	ADD_EXECUTABLE(RemoteVstPlugin "${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp")