From 2064ec6bf033b61bde28c4be0c64012d4cd2c87e Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Mon, 19 Oct 2020 09:58:48 +0200 Subject: [PATCH] Move RiuQssSyntaxHighlighter.h from MOC-headers to regular headers --- ApplicationCode/UserInterface/CMakeLists_files.cmake | 2 +- ThirdParty/qwt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/UserInterface/CMakeLists_files.cmake b/ApplicationCode/UserInterface/CMakeLists_files.cmake index fb0dfba201..a7e4027847 100644 --- a/ApplicationCode/UserInterface/CMakeLists_files.cmake +++ b/ApplicationCode/UserInterface/CMakeLists_files.cmake @@ -94,6 +94,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiuCategoryLegendFrame.h ${CMAKE_CURRENT_LIST_DIR}/RiuScalarMapperLegendFrame.h ${CMAKE_CURRENT_LIST_DIR}/RiuFileDialogTools.h ${CMAKE_CURRENT_LIST_DIR}/RiuGuiTheme.h +${CMAKE_CURRENT_LIST_DIR}/RiuQssSyntaxHighlighter.h ) set (SOURCE_GROUP_SOURCE_FILES @@ -244,7 +245,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RiuAbstractOverlayContentFrame.h ${CMAKE_CURRENT_LIST_DIR}/RiuAbstractLegendFrame.h ${CMAKE_CURRENT_LIST_DIR}/RiuCategoryLegendFrame.h ${CMAKE_CURRENT_LIST_DIR}/RiuScalarMapperLegendFrame.h -${CMAKE_CURRENT_LIST_DIR}/RiuQssSyntaxHighlighter.h ${CMAKE_CURRENT_LIST_DIR}/RiuTextEditWithCompletion.h ) diff --git a/ThirdParty/qwt b/ThirdParty/qwt index 0bd598c700..063027f0b5 160000 --- a/ThirdParty/qwt +++ b/ThirdParty/qwt @@ -1 +1 @@ -Subproject commit 0bd598c7008afbaa7216755fb9a4ac0da2e612eb +Subproject commit 063027f0b5d97c2b9e28c50595c92a4e9c55f7b1