aboutsummaryrefslogtreecommitdiff
path: root/launcher/tasks
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2023-08-02 19:27:48 +0200
committerGitHub <noreply@github.com>2023-08-02 19:27:48 +0200
commitfa2b784f7eb817e97d0af45fe78d205932ada193 (patch)
treef263bdc3fd2f945e6ecc75f9b59b55d009082cca /launcher/tasks
parentb1aa9e584624a0732dd55fc6c459524a8abfe6ba (diff)
parent01e17806f67534140a6db6cf90191f4db4dd30ac (diff)
downloadPrismLauncher-fa2b784f7eb817e97d0af45fe78d205932ada193.tar.gz
PrismLauncher-fa2b784f7eb817e97d0af45fe78d205932ada193.tar.bz2
PrismLauncher-fa2b784f7eb817e97d0af45fe78d205932ada193.zip
Merge branch 'develop' into sparkle-disable
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
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);