From 71a0d2ddf4b4e5f57806feaaea9c21af115e7183 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Date: Tue, 21 Apr 2015 16:00:00 +0200
Subject: [PATCH] Clang: Fix providing clang directory with intrinsics for
*.qbs
This was forgotten in e488f10c7f630c3f3eba3c37faccbf487adf129c.
Change-Id: I2fec272c9f1e44b3a691b782dcf6bee2a1768371
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
src/plugins/clangcodemodel/clangcodemodel.qbs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs
index c0466e972ba..e9a6c71fb28 100644
--- a/src/plugins/clangcodemodel/clangcodemodel.qbs
+++ b/src/plugins/clangcodemodel/clangcodemodel.qbs
@@ -53,7 +53,7 @@ QtcPlugin {
property string llvmIncludeDir: QtcProcessOutputReader.readOutput(llvmConfig, ["--includedir"])
property string llvmLibDir: QtcProcessOutputReader.readOutput(llvmConfig, ["--libdir"])
property string llvmVersion: QtcProcessOutputReader.readOutput(llvmConfig, ["--version"])
- .replace(/(\d+\.\d+).*/, "$1")
+ .replace(/(\d+\.\d+\.\d+).*/, "$1")
cpp.includePaths: base.concat(llvmIncludeDir)
cpp.libraryPaths: base.concat(llvmLibDir)
--
GitLab