diff options
| author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-05-25 14:18:33 +0200 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-05-25 12:48:30 +0000 |
| commit | 150d53e04139879ecea88d39cfa3a88eaf4da5f4 (patch) | |
| tree | 386f7b40bb3dad8a1b43760a1a7768ece80df316 /src | |
| parent | 6b071f5e367b6f9b8c9eb37acb9442075f95c97a (diff) | |
| download | qt-creator-150d53e04139879ecea88d39cfa3a88eaf4da5f4.tar.gz | |
Clang: Use QFileInfo instead of QDir for clang executable path
QDir::exists() returns false for files which is not the
intended behavior.
Change-Id: I768432df93e10b3f8f570da4d94035038ff52e06
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index d6921b07ff..a2ed615894 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -565,10 +565,10 @@ QString clangIncludeDirectory(const QString &clangVersion, const QString &clangR QString clangExecutable(const QString &clangBinDirectory) { const QString hostExeSuffix(QTC_HOST_EXE_SUFFIX); - QDir executable(creatorLibexecPath() + "/clang/bin/clang" + hostExeSuffix); + QFileInfo executable(creatorLibexecPath() + "/clang/bin/clang" + hostExeSuffix); if (!executable.exists()) - executable = QDir(clangBinDirectory + "/clang" + hostExeSuffix); - return QDir::toNativeSeparators(executable.canonicalPath()); + executable = QFileInfo(clangBinDirectory + "/clang" + hostExeSuffix); + return QDir::toNativeSeparators(executable.canonicalFilePath()); } void CompilerOptionsBuilder::undefineClangVersionMacrosForMsvc() |