1 files changed, 72 insertions, 29 deletions

diff --git a/src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs b/src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs
index 526265220c..b049589767 100644
--- a/src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs
+++ b/src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs
@@ -4,51 +4,93 @@ import qbs.FileInfo
 import qbs.Environment
 
 Project {
-    QtcDevHeaders {
-        productName: "syntax-highlighting (3rd party)"
-        baseDir: sourceDirectory + "/src/lib"
-    }
-    QtcDevHeaders {
-        productName: "syntax-highlighting autogenerated (3rd party)"
-        baseDir: sourceDirectory + "/autogenerated/src/lib"
-        Group {
-            prefix: baseDir + '/'
-            files: [
-                "AbstractHighlighter",
-                "Definition",
-                "DefinitionDownloader",
-                "FoldingRegion",
-                "Format",
-                "Repository",
-                "State",
-                "SyntaxHighlighter",
-                "Theme"
-            ]
-            qbs.install: true
-            qbs.installDir: qtc.ide_include_path + '/' + FileInfo.fileName(product.sourceDirectory)
-            qbs.installSourceBase: baseDir
+    Product {
+        name: "KSyntaxHighlighting"
+
+        Export {
+            Depends { name: "qtc" }
+            Depends {
+                name: "Qt.KSyntaxHighlighting"
+                condition: qtc.preferSystemSyntaxHighlighting
+                required: false
+            }
+            Depends {
+                name: "KSyntaxHighlighting_bundled"
+                required: !qtc.preferSystemSyntaxHighlighting
+            }
         }
     }
 
     QtcLibrary {
-        name: "KSyntaxHighlighting"
+        name: "KSyntaxHighlighting_bundled"
+        condition: !qtc.preferSystemSyntaxHighlighting || !Qt.KSyntaxHighlighting.present
 
-        cpp.defines: base.concat("KSYNTAXHIGHLIGHTING_LIBRARY")
+        cpp.defines: base.concat("KF6SyntaxHighlighting_EXPORTS")
         cpp.includePaths: [
             product.sourceDirectory + "/src/lib/",
+            product.sourceDirectory + "/autogenerated/include/",
             product.sourceDirectory + "/autogenerated/src/lib/",
             product.sourceDirectory + "/autogenerated/"
         ]
 
         Depends { name: "Qt.gui" }
         Depends { name: "Qt.network" }
+        Depends {
+            name: "Qt.KSyntaxHighlighting"
+            condition: qtc.preferSystemSyntaxHighlighting
+            required: false
+        }
 
         Group {
             name: "lib"
             prefix: "src/lib/"
             files: [
-                "*.h",
-                "*.cpp"
+                "abstracthighlighter.cpp",
+                "abstracthighlighter.h",
+                "abstracthighlighter_p.h",
+                "context.cpp",
+                "context_p.h",
+                "contextswitch.cpp",
+                "contextswitch_p.h",
+                "definition.cpp",
+                "definition.h",
+                "definition_p.h",
+                "definitiondownloader.cpp",
+                "definitiondownloader.h",
+                "definitionref_p.h",
+                "dynamicregexpcache_p.h",
+                "foldingregion.cpp",
+                "foldingregion.h",
+                "format.cpp",
+                "format.h",
+                "format_p.h",
+                "highlightingdata.cpp",
+                "highlightingdata_p.hpp",
+                "htmlhighlighter.cpp",
+                "htmlhighlighter.h",
+                "keywordlist.cpp",
+                "keywordlist_p.h",
+                "matchresult_p.h",
+                "repository.cpp",
+                "repository.h",
+                "repository_p.h",
+                "rule.cpp",
+                "rule_p.h",
+                "state.cpp",
+                "state.h",
+                "state_p.h",
+                "syntaxhighlighter.cpp",
+                "syntaxhighlighter.h",
+                "textstyledata_p.h",
+                "theme.cpp",
+                "theme.h",
+                "themedata.cpp",
+                "themedata_p.h",
+                "wildcardmatcher.cpp",
+                "wildcardmatcher.h",
+                "worddelimiters.cpp",
+                "worddelimiters_p.h",
+                "xml_p.h",
             ]
         }
 
@@ -81,8 +123,9 @@ Project {
         Export {
             Depends { name: "cpp" }
             cpp.includePaths: [
-                product.sourceDirectory + "/src/lib/",
-                product.sourceDirectory + "/autogenerated/src/lib/",
+                exportingProduct.sourceDirectory + "/src/lib/",
+                exportingProduct.sourceDirectory + "/autogenerated/include/",
+                exportingProduct.sourceDirectory + "/autogenerated/src/lib/",
             ]
         }
     }