Initial work to build backend against Qt5

source/backend/engine/Makefile

@@ -8,8 +8,16 @@ include ../Makefile.mk
 
 # --------------------------------------------------------------
 
-BUILD_CXX_FLAGS += $(shell pkg-config --cflags liblo QtCore QtXml)
-LINK_FLAGS      += $(shell pkg-config --libs liblo QtCore QtXml)
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags liblo)
+LINK_FLAGS      += $(shell pkg-config --libs liblo)
+
+ifeq ($(HAVE_QT5),true)
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags Qt5Core Qt5Xml)
+LINK_FLAGS      += $(shell pkg-config --libs Qt5Core Qt5Xml)
+else
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtXml)
+LINK_FLAGS      += $(shell pkg-config --libs QtCore QtXml)
+endif
 
 # --------------------------------------------------------------
 

source/backend/native/Makefile

@@ -9,8 +9,15 @@ include ../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += -I. -I../../libs/distrho -I../../widgets
+LINK_FLAGS      += $(shell pkg-config --libs liblo)
+
+ifeq ($(HAVE_QT5),true)
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags Qt5Core Qt5Widgets)
+LINK_FLAGS      += $(shell pkg-config --libs Qt5Core Qt5Widgets)
+else
 BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui)
-LINK_FLAGS      += $(shell pkg-config --libs QtCore QtGui liblo)
+LINK_FLAGS      += $(shell pkg-config --libs QtCore QtGui)
+endif
 
 # --------------------------------------------------------------
 

source/backend/native/distrho/DistrhoPluginCarla.cpp

@@ -19,9 +19,15 @@
 
 #include "DistrhoPluginMain.cpp"
 
+#include <QtCore/Qt>
+
 #if DISTRHO_PLUGIN_HAS_UI
-#include <QtGui/QMainWindow>
-#include "DistrhoUIMain.cpp"
+# if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#  include <QtWidgets/QMainWindow>
+# else
+#  include <QtGui/QMainWindow>
+# endif
+# include "DistrhoUIMain.cpp"
 #endif
 
 // -------------------------------------------------

source/backend/native/notes/DistrhoUINotes.hpp

@@ -21,10 +21,18 @@
 #include "DistrhoUIQt4.hpp"
 #include "paramspinbox.hpp"
 
-#include <QtGui/QGridLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QPushButton>
-#include <QtGui/QTextEdit>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+# include <QtWidgets/QProgressBar>
+# include <QtWidgets/QGridLayout>
+# include <QtWidgets/QLabel>
+# include <QtWidgets/QPushButton>
+# include <QtWidgets/QTextEdit>
+#else
+# include <QtGui/QGridLayout>
+# include <QtGui/QLabel>
+# include <QtGui/QPushButton>
+# include <QtGui/QTextEdit>
+#endif
 
 class QResizeEvent;
 

source/backend/plugin/CarlaPluginGui.hpp

@@ -20,9 +20,14 @@
 
 #include "CarlaPluginInternal.hpp"
 
-#include <QtGui/QMainWindow>
 #include <QtGui/QCloseEvent>
 
+# if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+# include <QtWidgets/QMainWindow>
+#else
+# include <QtGui/QMainWindow>
+#endif
+
 CARLA_BACKEND_START_NAMESPACE
 
 class CarlaPluginGui : public QMainWindow

source/backend/plugin/Makefile

@@ -8,8 +8,16 @@ include ../Makefile.mk
 
 # --------------------------------------------------------------
 
-BUILD_CXX_FLAGS += $(shell pkg-config --cflags liblo QtCore QtGui QtXml)
-LINK_FLAGS      += $(shell pkg-config --libs liblo QtCore QtGui QtXml)
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags liblo)
+LINK_FLAGS      += $(shell pkg-config --libs liblo)
+
+ifeq ($(HAVE_QT5),true)
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags Qt5Core Qt5Xml Qt5Widgets)
+LINK_FLAGS      += $(shell pkg-config --libs Qt5Core Qt5Xml Qt5Widgets)
+else
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui QtXml)
+LINK_FLAGS      += $(shell pkg-config --libs QtCore QtGui QtXml)
+endif
 
 # --------------------------------------------------------------
 
@@ -19,7 +27,7 @@ LINK_FLAGS      += $(shell pkg-config --libs fluidsynth)
 endif
 
 ifeq ($(HAVE_LINUXSAMPLER),true)
-BUILD_CXX_FLAGS += $(shell pkg-config --cflags linuxsampler) -DIS_CPP11=1
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags linuxsampler)
 LINK_FLAGS      += $(shell pkg-config --libs linuxsampler)
 endif
 

source/backend/plugin/NativePlugin.cpp

@@ -21,7 +21,13 @@
 
 #include "CarlaNative.h"
 
-#include <QtGui/QFileDialog>
+#include <QtCore/Qt>
+
+# if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+# include <QtWidgets/QFileDialog>
+#else
+# include <QtGui/QFileDialog>
+#endif
 
 void carla_register_all_plugins()
 {

source/backend/standalone/CarlaStandalone.cpp

@@ -24,12 +24,12 @@
 #include "CarlaMIDI.h"
 #include "CarlaNative.h"
 
-#include <QtGui/QApplication>
+#include <QtCore/Qt>
 
-#if 0
-extern "C" {
-#include "siginfo.c"
-}
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+# include <QtWidgets/QApplication>
+#else
+# include <QtGui/QApplication>
 #endif
 
 using CarlaBackend::CarlaEngine;

source/backend/standalone/Makefile

@@ -8,12 +8,24 @@ include ../Makefile.mk
 
 # --------------------------------------------------------------
 
-BUILD_CXX_FLAGS += $(shell pkg-config --cflags liblo QtGui)
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags liblo)
+
+ifeq ($(HAVE_QT5),true)
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags Qt5Core)
+else
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore)
+endif
 
 # --------------------------------------------------------------
 # Common
 
-LINK_FLAGS += $(shell pkg-config --libs liblo QtCore QtGui QtXml)
+LINK_FLAGS += $(shell pkg-config --libs liblo)
+
+ifeq ($(HAVE_QT5),true)
+LINK_FLAGS += $(shell pkg-config --libs Qt5Core Qt5Xml Qt5Widgets)
+else
+LINK_FLAGS += $(shell pkg-config --libs QtCore QtXml QtWidgets)
+endif
 
 # --------------------------------------------------------------
 # Engine

source/includes/CarlaDefines.hpp

@@ -42,20 +42,25 @@
 // Check for C++11 support
 #if defined(HAVE_CPP11_SUPPORT)
 # define CARLA_PROPER_CPP11_SUPPORT
+# define IS_CPP11 1
 #elif defined(__GNUC__) && defined(__GXX_EXPERIMENTAL_CXX0X__)
 # if  (__GNUC__ * 100 + __GNUC_MINOR__) >= 405
 #  define CARLA_PROPER_CPP11_SUPPORT
+#  if  (__GNUC__ * 100 + __GNUC_MINOR__) >= 407
+#    define IS_CPP11 1
+#  endif
 # endif
 #endif
 
-#ifdef CARLA_PROPER_CPP11_SUPPORT
-# define IS_CPP11 1
-#else
-# define IS_CPP11 0
+#ifndef CARLA_PROPER_CPP11_SUPPORT
 # define noexcept
 # define nullptr (0)
 #endif
 
+#ifndef IS_CPP11
+# define IS_CPP11 0
+#endif
+
 // Common includes
 #ifdef CARLA_OS_WIN
 # include <winsock2.h>

source/libs/distrho/DistrhoUIQt4.hpp

@@ -19,7 +19,13 @@
 
 #include "DistrhoUI.hpp"
 
-#include <QtGui/QWidget>
+#include <QtCore/Qt>
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+# include <QtWidgets/QWidget>
+#else
+# include <QtGui/QWidget>
+#endif
 
 START_NAMESPACE_DISTRHO
 

source/libs/distrho/src/DistrhoUIInternal.hpp

@@ -27,10 +27,15 @@
 # include "../DistrhoUIQt4.hpp"
 # include <QtGui/QMouseEvent>
 # include <QtGui/QResizeEvent>
-# include <QtGui/QSizeGrip>
-# include <QtGui/QVBoxLayout>
-# ifdef Q_WS_X11
-#  include <QtGui/QX11EmbedWidget>
+# if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#  include <QtWidgets/QSizeGrip>
+#  include <QtWidgets/QVBoxLayout>
+# else
+#  include <QtGui/QSizeGrip>
+#  include <QtGui/QVBoxLayout>
+#  ifdef Q_WS_X11
+#   include <QtGui/QX11EmbedWidget>
+#  endif
 # endif
 #endif
 

source/widgets/Makefile

@@ -9,8 +9,14 @@ include ../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += -fvisibility=hidden -fPIC -I.
-BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore)
-LINK_FLAGS      += $(shell pkg-config --libs QtCore)
+
+ifeq ($(HAVE_QT5),true)
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags Qt5Core Qt5Widgets)
+LINK_FLAGS      += $(shell pkg-config --libs Qt5Core Qt5Widgets)
+else
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui)
+LINK_FLAGS      += $(shell pkg-config --libs QtCore QtGui)
+endif
 
 FILES = \
 	moc_paramspinbox.cpp \

source/widgets/digitalpeakmeter.hpp

@@ -19,7 +19,12 @@
 #define __DIGITALPEAKMETER_HPP__
 
 #include <QtCore/QTimer>
-#include <QtGui/QWidget>
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+# include <QtWidgets/QWidget>
+#else
+# include <QtGui/QWidget>
+#endif
 
 class DigitalPeakMeter : public QWidget
 {

source/widgets/ledbutton.hpp

@@ -19,7 +19,12 @@
 #define __LEDBUTTON_HPP__
 
 #include <QtGui/QPixmap>
-#include <QtGui/QPushButton>
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+# include <QtWidgets/QPushButton>
+#else
+# include <QtGui/QPushButton>
+#endif
 
 class LEDButton : public QPushButton
 {

source/widgets/paramspinbox.hpp

@@ -18,7 +18,13 @@
 #ifndef __PARAMSPINBOX_HPP__
 #define __PARAMSPINBOX_HPP__
 
-#include <QtGui/QProgressBar>
+#include <QtCore/Qt>
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+# include <QtWidgets/QProgressBar>
+#else
+# include <QtGui/QProgressBar>
+#endif
 
 class TextCallback
 {

source/widgets/pixmapdial.hpp

@@ -18,9 +18,14 @@
 #ifndef __PIXMAPDIAL_HPP__
 #define __PIXMAPDIAL_HPP__
 
-#include <QtGui/QDial>
 #include <QtGui/QPixmap>
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+# include <QtWidgets/QDial>
+#else
+# include <QtGui/QDial>
+#endif
+
 class PixmapDial : public QDial
 {
 public:

source/widgets/pixmapkeyboard.hpp

@@ -20,7 +20,12 @@
 
 #include <map>
 #include <QtGui/QPixmap>
-#include <QtGui/QWidget>
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+# include <QtWidgets/QWidget>
+#else
+# include <QtGui/QWidget>
+#endif
 
 class PixmapKeyboard : public QWidget
 {