DecodeTrace: Add FlowLayout and integrate it

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6c88f4f640c37ffea1b972b0c39f956ab8c4156..3770f1e4d6eafc994930ab358fd58ce7ee46660c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,14 +101,16 @@ pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
 
 set(CMAKE_AUTOMOC TRUE)
 
-find_package(Qt5 COMPONENTS Core Gui Widgets Svg REQUIRED)
+find_package(Qt5 5.3 COMPONENTS Core Gui Widgets Svg REQUIRED)
+
+message(STATUS "Qt version: ${Qt5_VERSION}")
 
 if(WIN32)
        # MXE workaround: Use pkg-config to find Qt5 libs.
        # https://github.com/mxe/mxe/issues/1642
        # Not required (and doesn't work) on MSYS2.
        if(NOT DEFINED ENV{MSYSTEM})
-               pkg_check_modules(QT5ALL REQUIRED Qt5Widgets Qt5Gui Qt5Svg)
+               pkg_check_modules(QT5ALL REQUIRED Qt5Widgets>=5.3 Qt5Gui>=5.3 Qt5Svg>=5.3)
        endif()
 endif()
 
@@ -275,7 +277,6 @@ set(pulseview_SOURCES
        pv/views/trace/header.cpp
        pv/views/trace/marginwidget.cpp
        pv/views/trace/logicsignal.cpp
-       pv/views/trace/rowitem.cpp
        pv/views/trace/ruler.cpp
        pv/views/trace/signal.cpp
        pv/views/trace/timeitem.cpp
@@ -298,6 +299,7 @@ set(pulseview_SOURCES
        pv/widgets/colorpopup.cpp
        pv/widgets/devicetoolbutton.cpp
        pv/widgets/exportmenu.cpp
+       pv/widgets/flowlayout.cpp
        pv/widgets/importmenu.cpp
        pv/widgets/popup.cpp
        pv/widgets/popuptoolbutton.cpp
@@ -339,7 +341,6 @@ set(pulseview_HEADERS
        pv/views/trace/header.hpp
        pv/views/trace/logicsignal.hpp
        pv/views/trace/marginwidget.hpp
-       pv/views/trace/rowitem.hpp
        pv/views/trace/ruler.hpp
        pv/views/trace/signal.hpp
        pv/views/trace/timeitem.hpp
@@ -358,6 +359,7 @@ set(pulseview_HEADERS
        pv/widgets/colorpopup.hpp
        pv/widgets/devicetoolbutton.hpp
        pv/widgets/exportmenu.hpp
+       pv/widgets/flowlayout.hpp
        pv/widgets/importmenu.hpp
        pv/widgets/popup.hpp
        pv/widgets/popuptoolbutton.hpp
@@ -386,6 +388,8 @@ if(ENABLE_DECODE)
                pv/subwindows/decoder_selector/item.cpp
                pv/subwindows/decoder_selector/model.cpp
                pv/subwindows/decoder_selector/subwindow.cpp
+               pv/views/decoder_output/view.cpp
+               pv/views/decoder_output/QHexView.cpp
                pv/views/trace/decodetrace.cpp
                pv/widgets/decodergroupbox.cpp
                pv/widgets/decodermenu.cpp
@@ -394,6 +398,8 @@ if(ENABLE_DECODE)
        list(APPEND pulseview_HEADERS
                pv/data/decodesignal.hpp
                pv/subwindows/decoder_selector/subwindow.hpp
+               pv/views/decoder_output/view.hpp
+               pv/views/decoder_output/QHexView.hpp
                pv/views/trace/decodetrace.hpp
                pv/widgets/decodergroupbox.hpp
                pv/widgets/decodermenu.hpp