summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/compileroptionsbuilder.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@qt.io>2016-10-17 13:14:07 +0200
committerNikolai Kosjar <nikolai.kosjar@qt.io>2016-10-17 13:19:50 +0000
commitf31735142c93be7c0a17df6c9c080faee01915d0 (patch)
treee1b937cd968eac6337e9d5de469c32d6b0d64705 /src/plugins/cpptools/compileroptionsbuilder.cpp
parent3394cc7bfe22d323c3af15d2c31a536f5fda8c12 (diff)
downloadqt-creator-f31735142c93be7c0a17df6c9c080faee01915d0.tar.gz
CppTools: Exclude compiler option from conversion to native path
...otherwise e.g. MSVC's "/I" option will be converted to "\I". Change-Id: Ia01519ee5c942d0f3cdd32c4302055d0e58fb865 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
-rw-r--r--src/plugins/cpptools/compileroptionsbuilder.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp
index c529e96b45..ff96c13c4c 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.cpp
+++ b/src/plugins/cpptools/compileroptionsbuilder.cpp
@@ -127,10 +127,11 @@ void CompilerOptionsBuilder::addHeaderPathOptions(bool addAsNativePath)
break;
}
- QString path = prefix + headerPath.path;
- path = addAsNativePath ? QDir::toNativeSeparators(path) : path;
+ const QString path = addAsNativePath
+ ? QDir::toNativeSeparators(headerPath.path)
+ : headerPath.path;
- result.append(path);
+ result.append(prefix + path);
}
m_options.append(result);