diff options
| author | Ash <101582426+ashuntu@users.noreply.github.com> | 2023-07-28 21:22:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-28 21:22:35 +0000 |
| commit | d133b40b254630f988c57c1111e4659023324edc (patch) | |
| tree | 96217214a39945ef04e0d191d960481825ac65da /launcher/tasks | |
| parent | 51d7a6289e1cf2df463ae8d7c0b08b4a61faea3c (diff) | |
| parent | bdec11c501a6438706f62465d89f2344f7856342 (diff) | |
| download | PrismLauncher-d133b40b254630f988c57c1111e4659023324edc.tar.gz PrismLauncher-d133b40b254630f988c57c1111e4659023324edc.tar.bz2 PrismLauncher-d133b40b254630f988c57c1111e4659023324edc.zip | |
Merge branch 'PrismLauncher:develop' into develop
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); |