diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-11-19 15:38:13 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-11-19 15:38:13 +0100 |
| commit | 5ca70bdcb3e76268a2e69466b403b6e4b9516afd (patch) | |
| tree | 95caf64d08ea53410f45578c3e1e2d22e415d1c3 /src/libs/clangsupport | |
| parent | b2690664357cdb2cb6cd6380f608abedd58b0b9f (diff) | |
| parent | 9b6944086b53d34645bc81953c5f9a28ca9f3ed8 (diff) | |
Merge remote-tracking branch 'origin/4.14'
Change-Id: Iea84f23cf394de13e99a9ed777c8c113e4eff473
Diffstat (limited to 'src/libs/clangsupport')
| -rw-r--r-- | src/libs/clangsupport/commandlinebuilder.h | 1 | ||||
| -rw-r--r-- | src/libs/clangsupport/filepath.h | 1 | ||||
| -rw-r--r-- | src/libs/clangsupport/nativefilepath.h | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/src/libs/clangsupport/commandlinebuilder.h b/src/libs/clangsupport/commandlinebuilder.h index dedcf1c518..2678a25e4a 100644 --- a/src/libs/clangsupport/commandlinebuilder.h +++ b/src/libs/clangsupport/commandlinebuilder.h @@ -26,6 +26,7 @@ #pragma once #include "filepath.h" +#include "nativefilepath.h" #include <compilermacro.h> #include <includesearchpath.h> diff --git a/src/libs/clangsupport/filepath.h b/src/libs/clangsupport/filepath.h index b016b7de4f..bf6ed84301 100644 --- a/src/libs/clangsupport/filepath.h +++ b/src/libs/clangsupport/filepath.h @@ -28,7 +28,6 @@ #include "clangsupport_global.h" #include "filepathview.h" -#include "nativefilepath.h" #include <utils/hostosinfo.h> #include <utils/smallstringio.h> diff --git a/src/libs/clangsupport/nativefilepath.h b/src/libs/clangsupport/nativefilepath.h index 62234dd6fd..e94163fc87 100644 --- a/src/libs/clangsupport/nativefilepath.h +++ b/src/libs/clangsupport/nativefilepath.h @@ -26,7 +26,6 @@ #pragma once #include "filepathview.h" -#include "filepath.h" #include <utils/hostosinfo.h> #include <utils/smallstringio.h> |