hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Restrict "qt" embed method to Qt5 only

Browse Source
This commit is contained in:
Hyunin Song
2017-11-06 23:28:45 +09:00
parent df3c07bbed
commit b0f64dea7f
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/vst_base/VstPlugin.cpp
View File

@@ -659,6 +659,7 @@ void VstPlugin::createUI( QWidget * parent, bool isEffect )
m_pluginSubWindow = new vstSubWin( gui->mainWindow()->workspace() );
auto sw = m_pluginSubWindow.data();
#if QT_VERSION >= 0x050100
if (m_embedMethod == "qt" )
{
QWindow* vw = QWindow::fromWinId(m_pluginWindowID);
@@ -668,6 +669,8 @@ void VstPlugin::createUI( QWidget * parent, bool isEffect )
// Tell remote that it is embedded
// Wait for remote reply
}
#endif
#ifdef LMMS_BUILD_LINUX
else if (m_embedMethod == "xembed" )
{

3
src/gui/SetupDialog.cpp
View File

@@ -343,7 +343,10 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
m_vstEmbedComboBox = new QComboBox( embed_tw );
m_vstEmbedComboBox->move( XDelta, YDelta );
m_vstEmbedComboBox->addItem( tr( "No embedding" ), "none" );
#if QT_VERSION >= 0x050100
m_vstEmbedComboBox->addItem( tr( "Embed using Qt API" ), "qt" );
#endif
#ifdef LMMS_BUILD_LINUX
if ( QX11Info::isPlatformX11() ) {
m_vstEmbedComboBox->addItem( tr( "Embed using XEmbed protocol" ), "xembed" );