aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/compileoutputwindow.h
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2020-04-16 13:53:05 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2020-04-23 08:47:08 +0000
commit1c6e4fbd3211bc180b0de95d232226825bcb124d (patch)
treec9adce875a62a7fa980eb8a99231034585ae8fbf /src/plugins/projectexplorer/compileoutputwindow.h
parentb7851eeb55fd284bd647b7042e7f94a1ea1d3490 (diff)
Merge output formatters and output parsers
Now only one piece of code needs to be written to both linkify output in an output pane and create tasks for it in the issues pane. The calling sites are also simplified. For instance, until now, build steps had to feed their output parsers manually and then push the created tasks up the signal stack in parallel with the actual output, which the build manager relied upon for cross-linking the output pane content. Afterwards, the output would get forwarded to the formatter (and parsed for ANSI escape codes a second time). In contrast, a build step now just forwards the process output, and task parsing as well as output formatting is done centrally further up the stack. Concrete user-visible improvements so far: - File paths in compiler/linker messages are clickable links now. - QtTest applications now create clickable links also when run as part of a build step, not just in the app output pane. Task-number: QTCREATORBUG-22665 Change-Id: Ic9fb95b2d97f2520ab3ec653315e9219466ec08d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/compileoutputwindow.h')
-rw-r--r--src/plugins/projectexplorer/compileoutputwindow.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/compileoutputwindow.h b/src/plugins/projectexplorer/compileoutputwindow.h
index adea3aca80..caed6e8d66 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.h
+++ b/src/plugins/projectexplorer/compileoutputwindow.h
@@ -37,6 +37,9 @@ QT_BEGIN_NAMESPACE
class QToolButton;
QT_END_NAMESPACE
+namespace Core { class OutputWindow; }
+namespace Utils { class OutputFormatter; }
+
namespace ProjectExplorer {
class Task;
@@ -70,7 +73,7 @@ public:
void appendText(const QString &text, BuildStep::OutputFormat format);
- void registerPositionOf(const Task &task, int linkedOutputLines, int skipLines);
+ void registerPositionOf(const Task &task, int linkedOutputLines, int skipLines, int offset = 0);
bool knowsPositionOf(const Task &task);
void showPositionOf(const Task &task);
@@ -79,6 +82,8 @@ public:
const CompileOutputSettings &settings() const { return m_settings; }
void setSettings(const CompileOutputSettings &settings);
+ Utils::OutputFormatter *outputFormatter() const;
+
private:
void updateFilter() override;
@@ -86,7 +91,7 @@ private:
void storeSettings() const;
void updateFromSettings();
- CompileOutputTextEdit *m_outputWindow;
+ Core::OutputWindow *m_outputWindow;
QHash<unsigned int, QPair<int, int>> m_taskPositions;
ShowOutputTaskHandler *m_handler;
QToolButton *m_cancelBuildButton;