From e2aff08dd726ac026679229585fd51e034b51c8a Mon Sep 17 00:00:00 2001 From: David Runge Date: Tue, 2 Jul 2019 23:09:44 +0200 Subject: [PATCH] source/bridges-ui/CarlaBridgeToolkitQt.cpp: Include Qt4 .moc in previous location, so it won't fail during build. --- source/bridges-ui/CarlaBridgeToolkitQt.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/source/bridges-ui/CarlaBridgeToolkitQt.cpp b/source/bridges-ui/CarlaBridgeToolkitQt.cpp index dc274672e..0fbae9cfe 100644 --- a/source/bridges-ui/CarlaBridgeToolkitQt.cpp +++ b/source/bridges-ui/CarlaBridgeToolkitQt.cpp @@ -258,6 +258,21 @@ private: // ------------------------------------------------------------------------- +#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" +#endif + +#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0)) +# include "CarlaBridgeToolkitQt4.moc" +#endif + +#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) +# pragma GCC diagnostic pop +#endif + +// ------------------------------------------------------------------------- + CarlaBridgeToolkit* CarlaBridgeToolkit::createNew(CarlaBridgeFormat* const format) { return new CarlaBridgeToolkitQt(format); @@ -276,8 +291,6 @@ CARLA_BRIDGE_UI_END_NAMESPACE #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) # include "CarlaBridgeToolkitQt5.moc" -#else -# include "CarlaBridgeToolkitQt4.moc" #endif #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))