# HG changeset patch
# User Hasan Yavuz ÖZDERYA <hy@ozderya.net>
# Date 2016-12-31 14:47:48
# Node ID e423f1347315f230584736ed02bcc89b5258907d
# Parent  efe60c271bd1f7a262330bbbbd2ac07ade9e854b
# Parent  1c96dc8ca6536a243284eb5fb90918b5c418fd8f

Merge with default

diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,7 +124,7 @@ add_executable(${PROGRAM_NAME} WIN32
 
 # Use the Widgets module from Qt 5.
 target_link_libraries(${PROGRAM_NAME} ${QWT_LIBRARY})
-qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort Svg)
+qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort)
 
 if (BUILD_QWT)
   add_dependencies(${PROGRAM_NAME} QWT)
diff --git a/cmake/modules/BuildQwt.cmake b/cmake/modules/BuildQwt.cmake
--- a/cmake/modules/BuildQwt.cmake
+++ b/cmake/modules/BuildQwt.cmake
@@ -25,6 +25,8 @@ ExternalProject_Add(QWT
   # disable QwtDesigner plugin and enable static build
   PATCH_COMMAND sed -i -r -e "s/QWT_CONFIG\\s*\\+=\\s*QwtDesigner/#&/"
                           -e "s/QWT_CONFIG\\s*\\+=\\s*QwtDll/#&/"
+                          -e "s/QWT_CONFIG\\s*\\+=\\s*QwtSvg/#&/"
+                          -e "s/QWT_CONFIG\\s*\\+=\\s*QwtOpenGL/#&/"
 						  -e "s|QWT_INSTALL_PREFIX\\s*=.*|QWT_INSTALL_PREFIX = <INSTALL_DIR>|"
 							 <SOURCE_DIR>/qwtconfig.pri
   CONFIGURE_COMMAND qmake <SOURCE_DIR>/qwt.pro