Skip to content

Commit 0776367

Browse files
committed
Update to QtTaskTree changes in Qt Creator 19
1 parent 0c21d2e commit 0776367

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

llamalocatorfilter.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
#include <QJsonArray>
22
#include <QJsonObject>
33
#include <QMessageBox>
4+
#include <QtTaskTree/QTaskTree>
5+
46
#include <coreplugin/editormanager/editormanager.h>
57
#include <coreplugin/editormanager/ieditor.h>
68
#include <coreplugin/icore.h>
79
#include <coreplugin/locator/ilocatorfilter.h>
810
#include <git/gitconstants.h>
9-
#include <solutions/tasking/tasktree.h>
1011
#include <texteditor/textdocument.h>
1112
#include <texteditor/texteditor.h>
1213
#include <utils/algorithm.h>
@@ -109,7 +110,7 @@ LocatorMatcherTasks LocatorFilter::matchers()
109110
return storage.reportOutput(
110111
std::accumulate(std::begin(entries), std::end(entries), LocatorFilterEntries()));
111112
};
112-
return {Tasking::Sync(onSetup)};
113+
return {QSyncTask(onSetup)};
113114
}
114115

115116
void LocatorFilter::acceptPrompt(const QString &prompt)

tools/run_project_tool.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ void RunProjectTool::run(const QJsonObject &args,
101101
QMetaObject::Connection procStdOutConn;
102102
QMetaObject::Connection procStdErrConn;
103103
};
104-
const Tasking::Storage<Data> outputStorage;
104+
const QtTaskTree::Storage<Data> outputStorage;
105105

106106
auto modifier =
107-
[outputStorage, projectFile, done](Utils::Process &proc) -> Tasking::SetupResult {
107+
[outputStorage, projectFile, done](Utils::Process &proc) -> QtTaskTree::SetupResult {
108108
Data *d = outputStorage.activeStorage();
109109

110110
d->procStdOutConn = QObject::connect(&proc, &Process::readyReadStandardOutput, [d, &proc]() {
@@ -137,10 +137,10 @@ void RunProjectTool::run(const QJsonObject &args,
137137
done(result, ok);
138138
});
139139

140-
return Tasking::SetupResult::Continue;
140+
return QtTaskTree::SetupResult::Continue;
141141
};
142142

143-
const Tasking::Group recipe = Tasking::Group{outputStorage, runControl->processTask(modifier)};
143+
const QtTaskTree::Group recipe = QtTaskTree::Group{outputStorage, runControl->processTask(modifier)};
144144
runControl->setRunRecipe(recipe);
145145

146146
runControl->initiateStart();

0 commit comments

Comments
 (0)