Skip to main content
summaryrefslogtreecommitdiffstats
path: root/qt
diff options
context:
space:
mode:
authorDoug Schaefer2017-11-03 16:48:20 -0400
committerDoug Schaefer2017-11-03 16:48:20 -0400
commit87cd8401f4e36dfc25912e6c768dde2ae9caed4a (patch)
tree6aa870bd1899bc7e3bc6279c958389dc938f09af /qt
parentceeac1865a9b25e7bb97142abb3ac2d4b8213dc5 (diff)
downloadorg.eclipse.cdt-87cd8401f4e36dfc25912e6c768dde2ae9caed4a.tar.gz
org.eclipse.cdt-87cd8401f4e36dfc25912e6c768dde2ae9caed4a.tar.xz
org.eclipse.cdt-87cd8401f4e36dfc25912e6c768dde2ae9caed4a.zip
Hook up the error parser properly in the build configuration.
So we can have the error partitions that work with double clicking in the build console. Change-Id: I357f4efb8fd16232b78b18958c9863071feeebcc
Diffstat (limited to 'qt')
-rw-r--r--qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/build/QtBuildConfiguration.java8
1 files changed, 5 insertions, 3 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 545ce7f0b0..5fc73297b4 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
@@ -391,12 +391,13 @@ public class QtBuildConfiguration extends CBuildConfiguration
outStream.write(msg.toString());
// TODO qmake error parser
- watchProcess(process, new IConsoleParser[0], console);
+ watchProcess(process, console);
doFullBuild = false;
}
try (ErrorParserManager epm = new ErrorParserManager(project, getBuildDirectoryURI(), this,
getToolChain().getErrorParserIds())) {
+ epm.setOutputStream(console.getOutputStream());
// run make
List<String> command = new ArrayList<>(Arrays.asList(makeCommand));
command.add("all"); //$NON-NLS-1$
@@ -404,7 +405,7 @@ public class QtBuildConfiguration extends CBuildConfiguration
setBuildEnvironment(processBuilder.environment());
Process process = processBuilder.start();
outStream.write(String.join(" ", command) + '\n'); //$NON-NLS-1$
- watchProcess(process, new IConsoleParser[] { epm }, console);
+ watchProcess(process, new IConsoleParser[] { epm });
}
getProject().refreshLocal(IResource.DEPTH_INFINITE, monitor);
@@ -433,6 +434,7 @@ public class QtBuildConfiguration extends CBuildConfiguration
try (ErrorParserManager epm = new ErrorParserManager(project, getBuildDirectoryURI(), this,
getToolChain().getErrorParserIds())) {
+ epm.setOutputStream(console.getOutputStream());
// run make
List<String> command = new ArrayList<>(Arrays.asList(makeCommand));
command.add("clean"); //$NON-NLS-1$
@@ -440,7 +442,7 @@ public class QtBuildConfiguration extends CBuildConfiguration
setBuildEnvironment(processBuilder.environment());
Process process = processBuilder.start();
outStream.write(String.join(" ", command) + '\n'); //$NON-NLS-1$
- watchProcess(process, new IConsoleParser[] { epm }, console);
+ watchProcess(process, new IConsoleParser[] { epm });
}
project.refreshLocal(IResource.DEPTH_INFINITE, monitor);

Back to the top