Merge remote-tracking branch 'origin/4.14'

Change-Id: Ib9512b4fc5e17b04ca4be79fc315e79a52d06497
2021-02-22 12:19:58 +01:00
parent f47c7b2e90 7cb81fb5ba
commit c55e59cb77
8 changed files with 60 additions and 1 deletions
--- a/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt
+++ b/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt
@@ -43,6 +43,9 @@ add_qtc_library(KSyntaxHighlighting SHARED
    src/lib/xml_p.h
 )
 qtc_add_public_header(autogenerated/src/lib/State)
+# transitional qmake plugin build support
+qtc_add_public_header(${CMAKE_CURRENT_SOURCE_DIR}/../../../shared/syntax/syntax_shared.pri)
+qtc_add_public_header(syntax-highlighting_dependencies.pri)

 if(TARGET KSyntaxHighlighting)
  install(