Browse Source

source/bridges-ui/CarlaBridgeToolkitQt.cpp: Include Qt4 .moc in previous location, so it won't fail during build.

pull/895/head
David Runge 6 years ago
parent
commit
e2aff08dd7
No known key found for this signature in database GPG Key ID: 54C28F4FF5A1A949
1 changed files with 15 additions and 2 deletions
  1. +15
    -2
      source/bridges-ui/CarlaBridgeToolkitQt.cpp

+ 15
- 2
source/bridges-ui/CarlaBridgeToolkitQt.cpp View File

@@ -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))


Loading…
Cancel
Save