diff --git a/CoreApp/CMakeLists.txt b/CoreApp/CMakeLists.txt
index 7cbb569681a36914e74a84af98e96f28ab1ba2e7..0e3ed6c96e99e7b7cd60e92d2a66af71677a70f7 100644
--- a/CoreApp/CMakeLists.txt
+++ b/CoreApp/CMakeLists.txt
@@ -150,11 +150,23 @@ if ( NOT found EQUAL -1 )
   endif()
 endif()
 
-find_package(Qwt5)
+# use Qwt6 for QT5
+if (NOT FORCE_QT4 AND QT5_FOUND)
+  find_package(Qwt6)
+
+  if (QWT6_FOUND)
+    add_definitions(-DWITH_QWT)
+    set(INCLUDE_DIRS ${INCLUDE_DIRS} ${QWT6_INCLUDE_DIRS} )
+    set(ADDITIONAL_LINK_LIBRARIES ${COREAPP_ADDITIONAL_LINK_LIBRARIES} ${QWT6_LIBRARIES})
+  endif()
+else()
+  find_package(Qwt5)
 
-if(Qwt5_Qt4_FOUND)
-  add_definitions(-DWITH_QWT)
-  set(COREAPP_ADDITIONAL_LINK_LIBRARIES ${COREAPP_ADDITIONAL_LINK_LIBRARIES} ${Qwt5_Qt4_LIBRARY})
+  if(Qwt5_Qt4_FOUND)
+    add_definitions(-DWITH_QWT)
+    set(INCLUDE_DIRS ${INCLUDE_DIRS} ${Qwt5_INCLUDE_DIR} )
+    set(ADDITIONAL_LINK_LIBRARIES ${COREAPP_ADDITIONAL_LINK_LIBRARIES} ${Qwt5_Qt4_LIBRARY})
+  endif()
 endif()