X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=d85948c095afbd7713709f0705c5f334a8dddb66;hp=069ccd898b8be8501434840c16db3c28325b1750;hb=0891e69b714a1eaf8b0d5c2e85f092e9f0b44088;hpb=aff5174622cf79c6d42c0adbcb9ddbafdf1b96d1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 069ccd89..d85948c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,13 +138,12 @@ set(pulseview_SOURCES
 	pv/device/device.cpp
 	pv/device/file.cpp
 	pv/device/devinst.cpp
-	pv/device/inputfile.cpp
 	pv/device/sessionfile.cpp
 	pv/dialogs/about.cpp
 	pv/dialogs/connect.cpp
 	pv/dialogs/storeprogress.cpp
 	pv/popups/deviceoptions.cpp
-	pv/popups/probes.cpp
+	pv/popups/channels.cpp
 	pv/prop/bool.cpp
 	pv/prop/double.cpp
 	pv/prop/enum.cpp
@@ -186,7 +185,7 @@ set(pulseview_HEADERS
 	pv/dialogs/about.h
 	pv/dialogs/connect.h
 	pv/dialogs/storeprogress.h
-	pv/popups/probes.h
+	pv/popups/channels.h
 	pv/popups/deviceoptions.h
 	pv/prop/bool.h
 	pv/prop/double.h
@@ -275,7 +274,7 @@ endif()
 #= Global Definitions
 #-------------------------------------------------------------------------------
 
-add_definitions(${QT_DEFINITIONS})
+add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS)
 add_definitions(-D__STDC_LIMIT_MACROS)
 add_definitions(-Wall -Wextra)
 add_definitions(-std=c++11)