diff options
Diffstat (limited to 'carla-pr-895.diff')
| -rw-r--r-- | carla-pr-895.diff | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/carla-pr-895.diff b/carla-pr-895.diff new file mode 100644 index 000000000000..35f9a44a9c8d --- /dev/null +++ b/carla-pr-895.diff @@ -0,0 +1,37 @@ +diff --git a/source/bridges-ui/CarlaBridgeToolkitQt.cpp b/source/bridges-ui/CarlaBridgeToolkitQt.cpp +index 81478fd3b..0fbae9cfe 100644 +--- a/source/bridges-ui/CarlaBridgeToolkitQt.cpp ++++ b/source/bridges-ui/CarlaBridgeToolkitQt.cpp +@@ -263,9 +263,7 @@ class CarlaBridgeToolkitQt: public QObject, + # pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" + #endif + +-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) +-# include "CarlaBridgeToolkitQt5.moc" +-#else ++#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0)) + # include "CarlaBridgeToolkitQt4.moc" + #endif + +@@ -286,6 +284,21 @@ CARLA_BRIDGE_UI_END_NAMESPACE + + // ------------------------------------------------------------------------- + ++#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 "CarlaBridgeToolkitQt5.moc" ++#endif ++ ++#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) ++# pragma GCC diagnostic pop ++#endif ++ ++// ------------------------------------------------------------------------- ++ + #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) + # pragma GCC diagnostic push + # pragma GCC diagnostic ignored "-Wmissing-declarations" |