From a8aa3e153f1b838ac3908dd8ea36dd4d719ea988 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Fri, 24 Nov 2017 12:35:39 +0100 Subject: [PATCH] VST: Fix Qt4 compilation --- plugins/vst_base/CMakeLists.txt | 2 +- src/core/ConfigManager.cpp | 4 ---- src/gui/SetupDialog.cpp | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt index af58ffb1a..ed956e218 100644 --- a/plugins/vst_base/CMakeLists.txt +++ b/plugins/vst_base/CMakeLists.txt @@ -29,7 +29,7 @@ SET(REMOTE_VST_PLUGIN_FILEPATH "RemoteVstPlugin" CACHE STRING "Relative file pat ADD_DEFINITIONS(-DREMOTE_VST_PLUGIN_FILEPATH="${REMOTE_VST_PLUGIN_FILEPATH}") BUILD_PLUGIN(vstbase vst_base.cpp VstPlugin.cpp VstPlugin.h communication.h MOCFILES VstPlugin.h) -IF(LMMS_BUILD_LINUX) +IF(LMMS_BUILD_LINUX AND WANT_QT5) TARGET_LINK_LIBRARIES(vstbase qx11embedcontainer) ENDIF() diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp index e75e2413e..985d5e08c 100644 --- a/src/core/ConfigManager.cpp +++ b/src/core/ConfigManager.cpp @@ -35,10 +35,6 @@ #include "lmmsversion.h" -#ifdef LMMS_BUILD_LINUX -#include -#endif - static inline QString ensureTrailingSlash( const QString & s ) { if( ! s.isEmpty() && !s.endsWith('/') && !s.endsWith('\\') ) diff --git a/src/gui/SetupDialog.cpp b/src/gui/SetupDialog.cpp index e248b40a9..f88e1dcf6 100644 --- a/src/gui/SetupDialog.cpp +++ b/src/gui/SetupDialog.cpp @@ -67,10 +67,6 @@ #include "MidiApple.h" #include "MidiDummy.h" -#ifdef LMMS_BUILD_LINUX -#include -#endif - inline void labelWidget( QWidget * _w, const QString & _txt ) { QLabel * title = new QLabel( _txt, _w );