diff options
Diffstat (limited to 'gr-qtgui/src')
| -rw-r--r-- | gr-qtgui/src/lib/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am index 7a03e1978..1fd199e15 100644 --- a/gr-qtgui/src/lib/Makefile.am +++ b/gr-qtgui/src/lib/Makefile.am @@ -73,6 +73,7 @@ grinclude_HEADERS = \ qtgui_sink_c.h \ qtgui_sink_f.h +<<<<<<< HEAD QT_MOC_FLAGS=-DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB %.moc.cc : %.h |