[Commit-gnuradio] [gnuradio] 03/05: Merge branch 'master' into next

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch next
in repository gnuradio.

commit e4093bd558e043af98e140f0e1d4f073e8606421
Merge: 2292413 a6c90dd
Author: Johnathan Corgan <address@hidden>
Date:   Tue Sep 20 06:23:17 2016 -0700

    Merge branch 'master' into next
    
    Conflicts:
        gr-qtgui/examples/c++/CMakeLists.txt

 gr-qtgui/examples/c++/CMakeLists.txt | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --cc gr-qtgui/examples/c++/CMakeLists.txt
index fb0b19a,239b5db..8827519
--- a/gr-qtgui/examples/c++/CMakeLists.txt
+++ b/gr-qtgui/examples/c++/CMakeLists.txt
@@@ -35,16 -35,9 +35,15 @@@ list(APPEND QTGUI_LIBRARIE
    gnuradio-blocks
    gnuradio-fft
    gnuradio-runtime
-   ${QWT_LIBRARY_DIRS}
 +  ${QT_LIBRARIES}
  )
  
 -QT4_WRAP_CPP(qtgui_moc_sources display_qt.h)
 +if (${DESIRED_QT_VERSION} MATCHES 4)
 +    QT4_WRAP_CPP(qtgui_moc_sources display_qt.h)
 +else()
 +    QT5_WRAP_CPP(qtgui_moc_sources display_qt.h)
 +endif()
 +
  add_executable(display_qt display_qt.cc ${qtgui_moc_sources})
  target_link_libraries(display_qt ${QTGUI_LIBRARIES})