blob: 35f9a44a9c8d97ddd59e49541e85e9e52473e671 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
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"
|