diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2018-10-12 13:17:46 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-10-12 13:17:46 +0200 |
commit | 6f3e1896fa567bca8a9f3d35ea26cae518a9313e (patch) | |
tree | 7475ec4153bece275efc1a97d5fa7420aa07a880 /share/qbs/imports/qbs/Probes | |
parent | ec709675476e507ea094348091b0475084de976e (diff) | |
parent | fa5e42f915211637da0d6461c9764962ee47f923 (diff) |
Merge 1.12 into master
Change-Id: I96c735aeda89e02f1fa9107ecfc10ebf4b554dbc
Diffstat (limited to 'share/qbs/imports/qbs/Probes')
-rw-r--r-- | share/qbs/imports/qbs/Probes/MsvcProbe.qbs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/share/qbs/imports/qbs/Probes/MsvcProbe.qbs b/share/qbs/imports/qbs/Probes/MsvcProbe.qbs index d7e26b8e1..2d5faecdd 100644 --- a/share/qbs/imports/qbs/Probes/MsvcProbe.qbs +++ b/share/qbs/imports/qbs/Probes/MsvcProbe.qbs @@ -81,6 +81,8 @@ PathProbe { var inclPath = FileInfo.joinPaths(clParentDir, "INCLUDE"); if (!File.exists(inclPath)) inclPath = FileInfo.joinPaths(clParentDir, "..", "INCLUDE"); + if (!File.exists(inclPath)) + inclPath = FileInfo.joinPaths(clParentDir, "..", "..", "INCLUDE"); if (File.exists(inclPath)) includePaths = [inclPath]; |