Added initial Qt5 support

LMMS now properly builds and runs with Qt5. Various deprecated functions had to be replaced like QString::toAscii()/fromAscii(). Also occurences of FALSE/TRUE have been replaced with false/true. LmmsStyle now derives from QProxyStyle and sets a style instance as base style (Plastique for Qt4, Fusion for Qt5). MOC files are not included anymore but added as regular source files. What's missing is support for embedding VST plugins into a subwindow inside LMMS on Linux/X11 due to missing QX11EmbedContainer class in Qt5. Build instructions can be found in INSTALL.Qt5 Minimum version requirement for Qt4 has been raised to 4.6.0 for best API compatibility between Qt4 and Qt5.
pixelberk · Aug 14, 2014 · 4cee046 · 4cee046
1 parent dea2631
commit 4cee046
Show file tree

Hide file tree

Showing 284 changed files with 1,042 additions and 965 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,6 +42,7 @@ OPTION(WANT_TAP		"Include Tom's Audio Processing LADSPA plugins" ON)
 OPTION(WANT_VST		"Include VST support" ON)
 OPTION(WANT_VST_NOWINE	"Include partial VST support (without wine)" OFF)
 OPTION(WANT_WINMM	"Include WinMM MIDI support" OFF)
+OPTION(WANT_QT5		"Build with Qt5" OFF)
 
 
 IF(LMMS_BUILD_APPLE)
@@ -97,8 +98,20 @@ CHECK_INCLUDE_FILES(locale.h LMMS_HAVE_LOCALE_H)
 
 LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}")
 
+IF(WANT_QT5)
+	SET(QT5 TRUE)
+
+	FIND_PACKAGE(Qt5Core REQUIRED)
+	FIND_PACKAGE(Qt5Gui REQUIRED)
+	FIND_PACKAGE(Qt5Widgets REQUIRED)
+	FIND_PACKAGE(Qt5Xml REQUIRED)
+
+
+ELSE()
+	SET(QT5 FALSE)
+
 # check for Qt4
-SET(QT_MIN_VERSION "4.3.0" COMPONENTS QtCore QtGui QtXml)
+SET(QT_MIN_VERSION "4.6.0" COMPONENTS QtCore QtGui QtXml)
 FIND_PACKAGE(Qt4 REQUIRED)
 SET(QT_USE_QTXML 1)
 EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_TRANSLATIONS" OUTPUT_VARIABLE QT_TRANSLATIONS_DIR)
@@ -113,6 +126,7 @@ IF(NOT WIN32)
 	STRING(REPLACE "-DQT_DLL" "" QT_DEFINITIONS "${QT_DEFINITIONS}")
 ENDIF(NOT WIN32)
 INCLUDE("${QT_USE_FILE}")
+ENDIF()
 
 # check for libsndfile
 PKG_CHECK_MODULES(SNDFILE REQUIRED sndfile>=1.0.11)
@@ -357,9 +371,13 @@ ENDIF(GIT_FOUND)
 
 SET(lmms_EMBEDDED_RESOURCES "${CMAKE_SOURCE_DIR}/AUTHORS" "${CMAKE_SOURCE_DIR}/COPYING" "${CONTRIBUTORS}")
 
+IF(QT5)
+QT5_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw)
+QT5_WRAP_UI(lmms_UI_out ${lmms_UI})
+ELSE()
 QT4_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw)
 QT4_WRAP_UI(lmms_UI_out ${lmms_UI})
-
+ENDIF()
 
 # embedded resources stuff
 IF(WIN32 OR WIN64)
@@ -375,7 +393,7 @@ ENDIF(WIN32 OR WIN64)
 SET(LMMS_ER_H "${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h")
 
 # we somehow have to make LMMS-binary depend on MOC-files
-ADD_FILE_DEPENDENCIES("${CMAKE_BINARY_DIR}/lmmsconfig.h" ${lmms_MOC_out})
+ADD_FILE_DEPENDENCIES("${CMAKE_BINARY_DIR}/lmmsconfig.h")
 
 ADD_CUSTOM_COMMAND(OUTPUT "${LMMS_ER_H}" COMMAND "${BIN2RES}" ARGS ${lmms_EMBEDDED_RESOURCES} > "\"${LMMS_ER_H}\"" DEPENDS "${BIN2RES}")
 
@@ -448,10 +466,14 @@ IF(NOT ("${OGGVORBIS_INCLUDE_DIR}" STREQUAL ""))
 ENDIF()
 
 ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz" COMMAND gzip -c "\"${CMAKE_SOURCE_DIR}/lmms.1\"" > "\"${CMAKE_BINARY_DIR}/lmms.1.gz\"" DEPENDS "${CMAKE_SOURCE_DIR}/lmms.1" COMMENT "Generating lmms.1.gz")
-ADD_EXECUTABLE(lmms ${lmms_SOURCES} ${lmms_INCLUDES} "${LMMS_ER_H}" ${lmms_UI_out} lmmsconfig.h lmmsversion.h "${WINRC}" "${CMAKE_BINARY_DIR}/lmms.1.gz")
+ADD_EXECUTABLE(lmms ${lmms_SOURCES} ${lmms_INCLUDES} ${lmms_MOC_out} "${LMMS_ER_H}" ${lmms_UI_out} lmmsconfig.h lmmsversion.h "${WINRC}" "${CMAKE_BINARY_DIR}/lmms.1.gz")
 
 TARGET_LINK_LIBRARIES(lmms ${CMAKE_THREAD_LIBS_INIT} ${QT_LIBRARIES} ${ASOUND_LIBRARY} ${SDL_LIBRARY} ${PORTAUDIO_LIBRARIES} ${PULSEAUDIO_LIBRARIES} ${JACK_LIBRARIES} ${OGGVORBIS_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${SNDFILE_LIBRARIES} ${EXTRA_LIBRARIES})
 
+IF(QT5)
+	TARGET_LINK_LIBRARIES(lmms Qt5::Widgets Qt5::Xml)
+ENDIF()
+
 IF(LMMS_BUILD_WIN32)
 
 	SET_TARGET_PROPERTIES(lmms PROPERTIES LINK_FLAGS "${LINK_FLAGS} -mwindows")

diff --git a/INSTALL.Qt5 b/INSTALL.Qt5
@@ -0,0 +1,12 @@
+First of all please note that CMake >= 2.8.11 is required for building with
+Qt5 support. In order to build LMMS with Qt5, add the following flag when
+invoking cmake:
+
+-DWANT_QT5=ON
+
+If your Qt5 installation does not reside in standard installation paths,
+additionally pass e.g.
+
+-DCMAKE_PREFIX_PATH=/opt/qt53/
+
+
diff --git a/cmake/modules/BuildPlugin.cmake b/cmake/modules/BuildPlugin.cmake
@@ -67,10 +67,16 @@ MACRO(BUILD_PLUGIN)
 			DEPENDS ${BIN2RES})
 	ENDIF(ER_LEN)
 
+	IF(QT5)
+	QT5_WRAP_CPP(plugin_MOC_out ${PLUGIN_MOCFILES})
+	QT5_WRAP_UI(plugin_UIC_out ${PLUGIN_UICFILES})
+	ELSE()
 	QT4_WRAP_CPP(plugin_MOC_out ${PLUGIN_MOCFILES})
 	QT4_WRAP_UI(plugin_UIC_out ${PLUGIN_UICFILES})
+	ENDIF()
+
 	FOREACH(f ${PLUGIN_SOURCES})
-		ADD_FILE_DEPENDENCIES(${f} ${ER_H} ${plugin_MOC_out} ${plugin_UIC_out})
+		ADD_FILE_DEPENDENCIES(${f} ${ER_H} ${plugin_UIC_out})
 	ENDFOREACH(f)
 
 	IF(LMMS_BUILD_APPLE)
@@ -82,7 +88,11 @@ MACRO(BUILD_PLUGIN)
         	LINK_LIBRARIES(-llmms ${QT_LIBRARIES})
 	ENDIF(LMMS_BUILD_WIN32)
 
-	ADD_LIBRARY(${PLUGIN_NAME} MODULE ${PLUGIN_SOURCES})
+	ADD_LIBRARY(${PLUGIN_NAME} MODULE ${PLUGIN_SOURCES} ${plugin_MOC_out})
+	IF(QT5)
+	TARGET_LINK_LIBRARIES(${PLUGIN_NAME} Qt5::Widgets Qt5::Xml)
+	ENDIF()
+
 	INSTALL(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION "${PLUGIN_DIR}")
 
 	IF(LMMS_BUILD_APPLE)

diff --git a/include/AudioDevice.h b/include/AudioDevice.h
@@ -95,7 +95,7 @@ class AudioDevice
 	public:
 		setupWidget( const QString & _caption, QWidget * _parent ) :
 			tabWidget( tabWidget::tr( "Settings for %1" ).arg(
-					tabWidget::tr( _caption.toAscii() ) ).
+					tabWidget::tr( _caption.toLatin1() ) ).
 							toUpper(), _parent )
 		{
 		}

diff --git a/include/AutomatableModelView.h b/include/AutomatableModelView.h
@@ -29,7 +29,7 @@
 #include "AutomatableModel.h"
 
 class QMenu;
-
+class QMouseEvent;
 
 class EXPORT AutomatableModelView : public ModelView
 {

diff --git a/include/AutomationEditor.h b/include/AutomationEditor.h
@@ -27,7 +27,7 @@
 #define AUTOMATION_EDITOR_H
 
 #include <QtCore/QMutex>
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "lmms_basics.h"
 #include "JournallingObject.h"

diff --git a/include/Clipboard.h b/include/Clipboard.h
@@ -26,7 +26,7 @@
 #define _CLIPBOARD_H
 
 #include <QtCore/QMap>
-#include <QtXml/QDomElement>
+#include <QDomElement>
 
 
 class JournallingObject;

diff --git a/include/ControllerConnectionDialog.h b/include/ControllerConnectionDialog.h
@@ -27,9 +27,9 @@
 #ifndef _CONTROLLER_CONNECTION_DIALOG_H
 #define _CONTROLLER_CONNECTION_DIALOG_H
 
-#include <QtGui/QDialog>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QStandardItemModel>
+#include <QDialog>
+#include <QSortFilterProxyModel>
+#include <QStandardItemModel>
 
 #include "Controller.h"
 #include "AutomatableModel.h"

diff --git a/include/ControllerDialog.h b/include/ControllerDialog.h
@@ -26,7 +26,7 @@
 #ifndef _CONTROLLER_DIALOG_H
 #define _CONTROLLER_DIALOG_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "ModelView.h"
 

diff --git a/include/ControllerRackView.h b/include/ControllerRackView.h
@@ -25,7 +25,7 @@
 #ifndef _CONTROLLER_RACK_VIEW_H
 #define _CONTROLLER_RACK_VIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "SerializingObject.h"
 #include "lmms_basics.h"

diff --git a/include/ControllerView.h b/include/ControllerView.h
@@ -25,7 +25,7 @@
 #ifndef _CONTROLLER_VIEW_H
 #define _CONTROLLER_VIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "AutomatableModel.h"
 #include "Controller.h"

diff --git a/include/DataFile.h b/include/DataFile.h
@@ -27,7 +27,7 @@
 #ifndef DATA_FILE_H
 #define DATA_FILE_H
 
-#include <QtXml/QDomDocument>
+#include <QDomDocument>
 #include <QTextStream>
 
 #include "export.h"

diff --git a/include/EffectControlDialog.h b/include/EffectControlDialog.h
@@ -26,7 +26,7 @@
 #ifndef _EFFECT_CONTROL_DIALOG_H
 #define _EFFECT_CONTROL_DIALOG_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "ModelView.h"
 

diff --git a/include/EffectRackView.h b/include/EffectRackView.h
@@ -26,7 +26,7 @@
 #ifndef _EFFECT_RACK_VIEW_H
 #define _EFFECT_RACK_VIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "EffectChain.h"
 #include "ModelView.h"

diff --git a/include/EffectSelectDialog.h b/include/EffectSelectDialog.h
@@ -25,9 +25,9 @@
 #ifndef _EFFECT_SELECT_DIALOG_H
 #define _EFFECT_SELECT_DIALOG_H
 
-#include <QtGui/QDialog>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QStandardItemModel>
+#include <QDialog>
+#include <QSortFilterProxyModel>
+#include <QStandardItemModel>
 
 #include "EffectChain.h"
 #include "Effect.h"

diff --git a/include/EnvelopeAndLfoView.h b/include/EnvelopeAndLfoView.h
@@ -26,7 +26,7 @@
 #ifndef ENVELOPE_AND_LFO_VIEW_H
 #define ENVELOPE_AND_LFO_VIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "ModelView.h"
 

diff --git a/include/FileDialog.h b/include/FileDialog.h
@@ -26,7 +26,7 @@
 #ifndef FILEDIALOG_H
 #define FILEDIALOG_H
 
-#include <QtGui/QFileDialog>
+#include <QFileDialog>
 
 #include "export.h"
 

diff --git a/include/FxMixerView.h b/include/FxMixerView.h
@@ -25,10 +25,10 @@
 #ifndef FX_MIXER_VIEW_H
 #define FX_MIXER_VIEW_H
 
-#include <QtGui/QWidget>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QStackedLayout>
-#include <QtGui/QScrollArea>
+#include <QWidget>
+#include <QHBoxLayout>
+#include <QStackedLayout>
+#include <QScrollArea>
 
 #include "FxLine.h"
 #include "FxMixer.h"

diff --git a/include/Instrument.h b/include/Instrument.h
@@ -26,7 +26,7 @@
 #ifndef INSTRUMENT_H
 #define INSTRUMENT_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "Plugin.h"
 #include "Mixer.h"

diff --git a/include/InstrumentFunctionViews.h b/include/InstrumentFunctionViews.h
@@ -27,7 +27,7 @@
 
 #include "ModelView.h"
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 class QLabel;
 class comboBox;

diff --git a/include/InstrumentMidiIOView.h b/include/InstrumentMidiIOView.h
@@ -26,7 +26,7 @@
 #ifndef INSTRUMENT_MIDI_IO_VIEW_H
 #define INSTRUMENT_MIDI_IO_VIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "ModelView.h"
 

diff --git a/include/InstrumentSoundShapingView.h b/include/InstrumentSoundShapingView.h
@@ -25,7 +25,7 @@
 #ifndef _INSTRUMENT_SOUND_SHAPING_VIEW_H
 #define _INSTRUMENT_SOUND_SHAPING_VIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "InstrumentSoundShaping.h"
 #include "ModelView.h"

diff --git a/include/InstrumentView.h b/include/InstrumentView.h
@@ -48,7 +48,7 @@ class EXPORT InstrumentView : public PluginView
 		return( castModel<Instrument>() );
 	}
 
-	virtual void setModel( Model * _model, bool = FALSE );
+	virtual void setModel( Model * _model, bool = false );
 
 	InstrumentTrackWindow * instrumentTrackWindow();
 

diff --git a/include/LadspaControlView.h b/include/LadspaControlView.h
@@ -26,7 +26,7 @@
 #ifndef _LADSPA_CONTROL_VIEW_H
 #define _LADSPA_CONTROL_VIEW_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "ModelView.h"
 

diff --git a/include/LcdWidget.h b/include/LcdWidget.h
@@ -27,7 +27,7 @@
 #define _LCD_WIDGET_H
 
 #include <QtCore/QMap>
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "export.h"
 

diff --git a/include/LfoController.h b/include/LfoController.h
@@ -25,7 +25,7 @@
 #ifndef LFO_CONTROLLER_H
 #define LFO_CONTROLLER_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "Model.h"
 #include "AutomatableModel.h"

diff --git a/include/LmmsPalette.h b/include/LmmsPalette.h
@@ -23,7 +23,7 @@
  *
  */
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include "export.h"
 
 #ifndef LMMSPALETTE_H

diff --git a/include/LmmsStyle.h b/include/LmmsStyle.h
@@ -27,11 +27,11 @@
 #ifndef LMMS_STYLE_H
 #define LMMS_STYLE_H
 
-#include <QtGui/QPlastiqueStyle>
+#include <QProxyStyle>
 
 
 
-class LmmsStyle : public QPlastiqueStyle
+class LmmsStyle : public QProxyStyle
 {
 public:
 	enum ColorRole

diff --git a/include/MainWindow.h b/include/MainWindow.h
@@ -28,7 +28,7 @@
 #include <QtCore/QBasicTimer>
 #include <QtCore/QTimer>
 #include <QtCore/QList>
-#include <QtGui/QMainWindow>
+#include <QMainWindow>
 
 class QAction;
 class QDomElement;

diff --git a/include/MeterDialog.h b/include/MeterDialog.h
@@ -26,7 +26,7 @@
 #ifndef _METER_DIALOG_H
 #define _METER_DIALOG_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 #include "ModelView.h"
 

diff --git a/include/MidiClient.h b/include/MidiClient.h
@@ -112,7 +112,7 @@ class MidiClient
 	public:
 		setupWidget( const QString & _caption, QWidget * _parent ) :
 			tabWidget( tabWidget::tr( "Settings for %1" ).arg(
-					tr( _caption.toAscii() ) ).toUpper(),
+					tr( _caption.toLatin1() ) ).toUpper(),
 								_parent )
 		{
 		}