aboutsummaryrefslogtreecommitdiff
path: root/launcher/tasks
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-07-27 00:05:59 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-07-27 00:05:59 +0300
commit3c472fd7e0cbe517c63f41f8c02767e372e916a1 (patch)
tree3ae2752ae0b5991401737b2402b47a9131c2e5c6 /launcher/tasks
parent477b72ad33c29de097585ed415e1940cc25e2b34 (diff)
parentd960effb994ba421c502d8d5e0a1bb4d46efd9a3 (diff)
downloadPrismLauncher-3c472fd7e0cbe517c63f41f8c02767e372e916a1.tar.gz
PrismLauncher-3c472fd7e0cbe517c63f41f8c02767e372e916a1.tar.bz2
PrismLauncher-3c472fd7e0cbe517c63f41f8c02767e372e916a1.zip
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2
Diffstat (limited to 'launcher/tasks')
-rw-r--r--launcher/tasks/Task.cpp2
-rw-r--r--launcher/tasks/Task.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/launcher/tasks/Task.cpp b/launcher/tasks/Task.cpp
index 29c55cd4..fd82ec00 100644
--- a/launcher/tasks/Task.cpp
+++ b/launcher/tasks/Task.cpp
@@ -161,7 +161,7 @@ void Task::emitSucceeded()
emit finished();
}
-void Task::propogateStepProgress(TaskStepProgress const& task_progress)
+void Task::propagateStepProgress(TaskStepProgress const& task_progress)
{
emit stepProgress(task_progress);
}
diff --git a/launcher/tasks/Task.h b/launcher/tasks/Task.h
index 6d8bbbb4..57177697 100644
--- a/launcher/tasks/Task.h
+++ b/launcher/tasks/Task.h
@@ -167,7 +167,7 @@ class Task : public QObject, public QRunnable {
virtual void emitAborted();
virtual void emitFailed(QString reason = "");
- virtual void propogateStepProgress(TaskStepProgress const& task_progress);
+ virtual void propagateStepProgress(TaskStepProgress const& task_progress);
public slots:
void setStatus(const QString& status);