diff options
| author | Tom Rondeau | 2010-09-17 11:54:32 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2010-10-05 22:10:01 -0400 |
| commit | f18025c099e4f69829dc4fc1732a4a9e83b3eb1d (patch) | |
| tree | 21fc93870e0f048f25a27acfa96c6bac7363e2b5 /gr-qtgui | |
| parent | c1e6c53608175ffcce78a09baeba2c8aaa1a847d (diff) | |
| download | gnuradio-f18025c099e4f69829dc4fc1732a4a9e83b3eb1d.tar.gz gnuradio-f18025c099e4f69829dc4fc1732a4a9e83b3eb1d.tar.bz2 gnuradio-f18025c099e4f69829dc4fc1732a4a9e83b3eb1d.zip | |
Finally, the simple fix for the qtgui issues; also, changed the naming scheme output from _moc to .moc files because I think this looks cleaner.
Diffstat (limited to 'gr-qtgui')
| -rw-r--r-- | gr-qtgui/src/lib/Makefile.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am index 1fd199e15..4ba637ad6 100644 --- a/gr-qtgui/src/lib/Makefile.am +++ b/gr-qtgui/src/lib/Makefile.am @@ -73,8 +73,6 @@ 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 $(QT_MOC_EXEC) $(QT_MOC_FLAGS) -p $(srcdir) $< -o $@ |