Browse Source

Add some safeguards against wrong Qt bridge builds

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.1-rc1
falkTX 5 years ago
parent
commit
226561ed1b
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 9 additions and 0 deletions
  1. +3
    -0
      Makefile
  2. +6
    -0
      source/bridges-ui/CarlaBridgeToolkitQt.cpp

+ 3
- 0
Makefile View File

@@ -78,6 +78,9 @@ ALL_LIBS += $(3RD_LIBS)

3rd: $(3RD_LIBS)
@$(MAKE) -C source/theme
ifeq ($(HAVE_QT4),true)
@$(MAKE) -C source/bridges-ui ui_lv2-qt4
endif

libs: $(ALL_LIBS)



+ 6
- 0
source/bridges-ui/CarlaBridgeToolkitQt.cpp View File

@@ -23,9 +23,15 @@
#include <QtCore/QTimerEvent>

#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
# ifdef BRIDGE_QT4
# error Wrong includes for this bridge!
# endif
# include <QtWidgets/QApplication>
# include <QtWidgets/QMainWindow>
#else
# ifdef BRIDGE_QT5
# error Wrong includes for this bridge!
# endif
# include <QtGui/QApplication>
# include <QtGui/QMainWindow>
# ifdef HAVE_X11


Loading…
Cancel
Save