Skip to main content
summaryrefslogtreecommitdiffstats
path: root/qt
diff options
context:
space:
mode:
authorDoug Schaefer2016-10-20 10:23:15 -0400
committerDoug Schaefer2016-10-20 12:02:48 -0400
commit0868cf82ee5fc5bbb5d88f63db57d42489a54242 (patch)
tree927f1b5b520105ec562a782f3f1cbed3552dfef7 /qt
parent78ba80e1d50333b8021c01afa7edbd9815612ad8 (diff)
downloadorg.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.
Diffstat (limited to 'qt')
-rw-r--r--qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/build/QtBuildConfiguration.java7
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 460531accd..d2bd857627 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();
}
}

Back to the top