diff options
author | Doug Schaefer | 2016-10-20 14:23:15 +0000 |
---|---|---|
committer | Doug Schaefer | 2016-10-20 16:02:48 +0000 |
commit | 0868cf82ee5fc5bbb5d88f63db57d42489a54242 (patch) | |
tree | 927f1b5b520105ec562a782f3f1cbed3552dfef7 | |
parent | 78ba80e1d50333b8021c01afa7edbd9815612ad8 (diff) | |
download | org.eclipse.cdt-0868cf82ee5fc5bbb5d88f63db57d42489a54242.tar.gz org.eclipse.cdt-0868cf82ee5fc5bbb5d88f63db57d42489a54242.tar.xz org.eclipse.cdt-0868cf82ee5fc5bbb5d88f63db57d42489a54242.zip |
Fix include paths to make them relative to the project file for Qt.
Change-Id: I81c334a2c0ed85487a60ef14a6f28d7b87b6fbf3
-rw-r--r-- | qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/build/QtBuildConfiguration.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/build/QtBuildConfiguration.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/build/QtBuildConfiguration.java index 460531accda..d2bd857627e 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/build/QtBuildConfiguration.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/build/QtBuildConfiguration.java @@ -277,11 +277,8 @@ public class QtBuildConfiguration extends CBuildConfiguration for (int i = 0; i < includePaths.length; ++i) { Path path = Paths.get(includePaths[i]); if (!path.isAbsolute()) { - try { - includePaths[i] = getBuildDirectory().resolve(path).toString(); - } catch (CoreException e) { - Activator.log(e); - } + Path projectDir = getProjectFile().getParent(); + includePaths[i] = projectDir.resolve(path).toString(); } } |