From 5e4938ca4c94d870be569333d354404379f961f2 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Fri, 27 Mar 2020 01:56:14 -0700 Subject: [PATCH] fix moc compilation error in some gui plugins, using fix from #2681 --- .../plugins/gui_overlay_plugin_spawn/GUIExampleSpawnWidget.hh | 3 +++ .../plugins/gui_overlay_plugin_time/GUIExampleTimeWidget.hh | 3 +++ examples/plugins/mainwindow_example/MainWindowExampleWidget.hh | 3 +++ 3 files changed, 9 insertions(+) diff --git a/examples/plugins/gui_overlay_plugin_spawn/GUIExampleSpawnWidget.hh b/examples/plugins/gui_overlay_plugin_spawn/GUIExampleSpawnWidget.hh index 09b39ed557..4798b9800c 100644 --- a/examples/plugins/gui_overlay_plugin_spawn/GUIExampleSpawnWidget.hh +++ b/examples/plugins/gui_overlay_plugin_spawn/GUIExampleSpawnWidget.hh @@ -19,7 +19,10 @@ #include #include +// moc parsing error of tbb headers +#ifndef Q_MOC_RUN #include +#endif namespace gazebo { diff --git a/examples/plugins/gui_overlay_plugin_time/GUIExampleTimeWidget.hh b/examples/plugins/gui_overlay_plugin_time/GUIExampleTimeWidget.hh index 1ef72502c5..a3c8352be8 100644 --- a/examples/plugins/gui_overlay_plugin_time/GUIExampleTimeWidget.hh +++ b/examples/plugins/gui_overlay_plugin_time/GUIExampleTimeWidget.hh @@ -21,7 +21,10 @@ #include #include +// moc parsing error of tbb headers +#ifndef Q_MOC_RUN #include +#endif namespace gazebo { diff --git a/examples/plugins/mainwindow_example/MainWindowExampleWidget.hh b/examples/plugins/mainwindow_example/MainWindowExampleWidget.hh index 36947adff8..7659466495 100644 --- a/examples/plugins/mainwindow_example/MainWindowExampleWidget.hh +++ b/examples/plugins/mainwindow_example/MainWindowExampleWidget.hh @@ -22,7 +22,10 @@ #include #include +// moc parsing error of tbb headers +#ifndef Q_MOC_RUN #include +#endif namespace gazebo {