From 0868cf82ee5fc5bbb5d88f63db57d42489a54242 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Thu, 20 Oct 2016 10:23:15 -0400 Subject: [PATCH] Fix include paths to make them relative to the project file for Qt. Change-Id: I81c334a2c0ed85487a60ef14a6f28d7b87b6fbf3 --- .../cdt/internal/qt/core/build/QtBuildConfiguration.java | 7 ++----- 1 file 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(); } }