diff options
author | TheKodeToad <TheKodeToad@proton.me> | 2023-07-31 14:40:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-31 14:40:27 +0100 |
commit | b572f75dbaad61cf305f1fd4f60ba94d74bfa3fa (patch) | |
tree | 4e1ad65d3e51a1c3a1d7cae3a203fadddb3bbc2f /launcher/tasks | |
parent | 719d87de3bb6f65bc63ad518126074fd9f5f6283 (diff) | |
parent | 9137721e8e5b44f2338a36874a393435cbc6daa3 (diff) | |
download | PrismLauncher-b572f75dbaad61cf305f1fd4f60ba94d74bfa3fa.tar.gz PrismLauncher-b572f75dbaad61cf305f1fd4f60ba94d74bfa3fa.tar.bz2 PrismLauncher-b572f75dbaad61cf305f1fd4f60ba94d74bfa3fa.zip |
Merge branch 'PrismLauncher:develop' into icon-indexing
Diffstat (limited to 'launcher/tasks')
-rw-r--r-- | launcher/tasks/Task.cpp | 2 | ||||
-rw-r--r-- | launcher/tasks/Task.h | 2 |
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); |