X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=test%2FCMakeLists.txt;h=300532e11394744e407b124feee4e903fed22ec1;hp=8cab18feb3db969f59d5a53813f9b07885a2c04c;hb=39dce56b0e0b4daba503663e44ee6c86a754ddc2;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8cab18fe..300532e1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -19,8 +19,11 @@
 ##
 
 set(pulseview_TEST_SOURCES
+	${PROJECT_SOURCE_DIR}/pv/application.cpp
 	${PROJECT_SOURCE_DIR}/pv/devicemanager.cpp
 	${PROJECT_SOURCE_DIR}/pv/globalsettings.cpp
+	${PROJECT_SOURCE_DIR}/pv/logging.cpp
+	${PROJECT_SOURCE_DIR}/pv/mainwindow.cpp
 	${PROJECT_SOURCE_DIR}/pv/session.cpp
 	${PROJECT_SOURCE_DIR}/pv/storesession.cpp
 	${PROJECT_SOURCE_DIR}/pv/util.cpp
@@ -41,6 +44,7 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/devices/sessionfile.cpp
 	${PROJECT_SOURCE_DIR}/pv/dialogs/connect.cpp
 	${PROJECT_SOURCE_DIR}/pv/dialogs/inputoutputoptions.cpp
+	${PROJECT_SOURCE_DIR}/pv/dialogs/settings.cpp
 	${PROJECT_SOURCE_DIR}/pv/dialogs/storeprogress.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/bool.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/double.cpp
@@ -61,7 +65,6 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/views/trace/rowitem.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/ruler.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/signal.cpp
-	${PROJECT_SOURCE_DIR}/pv/views/trace/signalscalehandle.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/timeitem.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/timemarker.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/trace.cpp
@@ -78,8 +81,8 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/views/trace/viewwidget.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/viewbase.cpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/standardbar.cpp
-	${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.cpp
-	${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.cpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/colorbutton.cpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/colorpopup.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/devicetoolbutton.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/exportmenu.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/importmenu.cpp
@@ -98,7 +101,11 @@ set(pulseview_TEST_SOURCES
 
 # This list includes only QObject derived class headers.
 set(pulseview_TEST_HEADERS
+	${PROJECT_SOURCE_DIR}/pv/application.hpp
+	${PROJECT_SOURCE_DIR}/pv/devicemanager.hpp
 	${PROJECT_SOURCE_DIR}/pv/globalsettings.hpp
+	${PROJECT_SOURCE_DIR}/pv/logging.hpp
+	${PROJECT_SOURCE_DIR}/pv/mainwindow.hpp
 	${PROJECT_SOURCE_DIR}/pv/session.hpp
 	${PROJECT_SOURCE_DIR}/pv/storesession.hpp
 	${PROJECT_SOURCE_DIR}/pv/binding/device.hpp
@@ -110,6 +117,7 @@ set(pulseview_TEST_HEADERS
 	${PROJECT_SOURCE_DIR}/pv/devices/device.hpp
 	${PROJECT_SOURCE_DIR}/pv/dialogs/connect.hpp
 	${PROJECT_SOURCE_DIR}/pv/dialogs/inputoutputoptions.hpp
+	${PROJECT_SOURCE_DIR}/pv/dialogs/settings.hpp
 	${PROJECT_SOURCE_DIR}/pv/dialogs/storeprogress.hpp
 	${PROJECT_SOURCE_DIR}/pv/popups/channels.hpp
 	${PROJECT_SOURCE_DIR}/pv/popups/deviceoptions.hpp
@@ -129,7 +137,6 @@ set(pulseview_TEST_HEADERS
 	${PROJECT_SOURCE_DIR}/pv/views/trace/rowitem.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/ruler.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/signal.hpp
-	${PROJECT_SOURCE_DIR}/pv/views/trace/signalscalehandle.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/timeitem.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/timemarker.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/trace.hpp
@@ -142,8 +149,8 @@ set(pulseview_TEST_HEADERS
 	${PROJECT_SOURCE_DIR}/pv/views/trace/viewwidget.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/viewbase.hpp
 	${PROJECT_SOURCE_DIR}/pv/views/trace/standardbar.hpp
-	${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.hpp
-	${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/colorbutton.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/colorpopup.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/devicetoolbutton.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/exportmenu.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/importmenu.hpp
@@ -157,7 +164,7 @@ set(pulseview_TEST_HEADERS
 if(ENABLE_DECODE)
 	list(APPEND pulseview_TEST_SOURCES
 		${PROJECT_SOURCE_DIR}/pv/binding/decoder.cpp
-		${PROJECT_SOURCE_DIR}/pv/data/decoderstack.cpp
+		${PROJECT_SOURCE_DIR}/pv/data/decodesignal.cpp
 		${PROJECT_SOURCE_DIR}/pv/data/decode/annotation.cpp
 		${PROJECT_SOURCE_DIR}/pv/data/decode/decoder.cpp
 		${PROJECT_SOURCE_DIR}/pv/data/decode/row.cpp
@@ -165,11 +172,10 @@ if(ENABLE_DECODE)
 		${PROJECT_SOURCE_DIR}/pv/views/trace/decodetrace.cpp
 		${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.cpp
 		${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.cpp
-		data/decoderstack.cpp
 	)
 
 	list(APPEND pulseview_TEST_HEADERS
-		${PROJECT_SOURCE_DIR}/pv/data/decoderstack.hpp
+		${PROJECT_SOURCE_DIR}/pv/data/decodesignal.hpp
 		${PROJECT_SOURCE_DIR}/pv/views/trace/decodetrace.hpp
 		${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.hpp
 		${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.hpp