aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/solutions
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/solutions')
-rw-r--r--src/libs/solutions/tasking/CMakeLists.txt4
-rw-r--r--src/libs/solutions/tasking/tasktree.cpp16
-rw-r--r--src/libs/solutions/tasking/tasktree.h4
3 files changed, 13 insertions, 11 deletions
diff --git a/src/libs/solutions/tasking/CMakeLists.txt b/src/libs/solutions/tasking/CMakeLists.txt
index f70c910e04..926343e9c8 100644
--- a/src/libs/solutions/tasking/CMakeLists.txt
+++ b/src/libs/solutions/tasking/CMakeLists.txt
@@ -5,7 +5,9 @@ add_qtc_library(Tasking OBJECT
SOURCES
barrier.cpp barrier.h
concurrentcall.h
- networkquery.cpp networkquery.h
+ networkquery.cpp
tasking_global.h
tasktree.cpp tasktree.h
+ EXPLICIT_MOC
+ networkquery.h
)
diff --git a/src/libs/solutions/tasking/tasktree.cpp b/src/libs/solutions/tasking/tasktree.cpp
index 2a4c7cefd9..43a47121b2 100644
--- a/src/libs/solutions/tasking/tasktree.cpp
+++ b/src/libs/solutions/tasking/tasktree.cpp
@@ -1750,9 +1750,9 @@ TaskTree::TaskTree()
{
}
-TaskTree::TaskTree(const Group &root) : TaskTree()
+TaskTree::TaskTree(const Group &recipe) : TaskTree()
{
- setupRoot(root);
+ setRecipe(recipe);
}
TaskTree::~TaskTree()
@@ -1763,27 +1763,27 @@ TaskTree::~TaskTree()
delete d;
}
-void TaskTree::setupRoot(const Group &root)
+void TaskTree::setRecipe(const Group &recipe)
{
QTC_ASSERT(!isRunning(), qWarning("The TaskTree is already running, ignoring..."); return);
- QTC_ASSERT(!d->m_guard.isLocked(), qWarning("The setupRoot() is called from one of the"
- "TaskTree handlers, ingoring..."); return);
+ QTC_ASSERT(!d->m_guard.isLocked(), qWarning("The setRecipe() is called from one of the"
+ "TaskTree handlers, ignoring..."); return);
d->m_storages.clear();
- d->m_root.reset(new TaskNode(d, root, nullptr));
+ d->m_root.reset(new TaskNode(d, recipe, nullptr));
}
void TaskTree::start()
{
QTC_ASSERT(!isRunning(), qWarning("The TaskTree is already running, ignoring..."); return);
QTC_ASSERT(!d->m_guard.isLocked(), qWarning("The start() is called from one of the"
- "TaskTree handlers, ingoring..."); return);
+ "TaskTree handlers, ignoring..."); return);
d->start();
}
void TaskTree::stop()
{
QTC_ASSERT(!d->m_guard.isLocked(), qWarning("The stop() is called from one of the"
- "TaskTree handlers, ingoring..."); return);
+ "TaskTree handlers, ignoring..."); return);
d->stop();
}
diff --git a/src/libs/solutions/tasking/tasktree.h b/src/libs/solutions/tasking/tasktree.h
index dcd7b86ac1..11cc2708dd 100644
--- a/src/libs/solutions/tasking/tasktree.h
+++ b/src/libs/solutions/tasking/tasktree.h
@@ -378,10 +378,10 @@ class TASKING_EXPORT TaskTree final : public QObject
public:
TaskTree();
- TaskTree(const Group &root);
+ TaskTree(const Group &recipe);
~TaskTree();
- void setupRoot(const Group &root);
+ void setRecipe(const Group &recipe);
void start();
void stop();