Merge remote-tracking branch 'origin/4.14'

Change-Id: I842a7c7358fd0ff6d85c151806e440043914e09a
2020-12-14 14:19:15 +01:00
parent cf010911f7 30397fd2d4
commit 4bc2b4741d
65 changed files with 768 additions and 514 deletions
--- a/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt
+++ b/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt
@@ -1,4 +1,11 @@
+if(TARGET KF5::SyntaxHighlighting)
+  set(HIGHLIGHTING_BUILD_DEFAULT OFF)
+else()
+  set(HIGHLIGHTING_BUILD_DEFAULT ON)
+endif()
+
 add_qtc_library(KSyntaxHighlighting SHARED
+  BUILD_DEFAULT ${HIGHLIGHTING_BUILD_DEFAULT}
  INCLUDES autogenerated/
  PUBLIC_INCLUDES
    src/lib