diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2019-09-04 10:48:41 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2019-09-06 14:29:57 +0200 |
| commit | f553f4aa6f656489adf56b5421df24171ec56ca4 (patch) | |
| tree | 36b0471c04b32ab3fa65f3ec9a7f0496fb639b4f | |
| parent | 0c1dd0be7d106e3e5c5a096f91e3908d19d94d57 (diff) | |
| parent | 8a7cfd5bb38d272d93a09f46cfb47d265420d1ff (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
| -rw-r--r-- | src/manager-lib/application.h | 2 | ||||
| -rw-r--r-- | src/manager-lib/processstatus.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/manager-lib/application.h b/src/manager-lib/application.h index 0b081329..c02051f1 100644 --- a/src/manager-lib/application.h +++ b/src/manager-lib/application.h @@ -164,7 +164,7 @@ signals: void lastExitStatusChanged(); void activated(); void stateChanged(State state); - void runStateChanged(Am::RunState state); + void runStateChanged(QT_PREPEND_NAMESPACE_AM(Am::RunState) state); protected: QScopedPointer<AbstractApplicationInfo> m_info; diff --git a/src/manager-lib/processstatus.cpp b/src/manager-lib/processstatus.cpp index 8d6e88c4..6b23a853 100644 --- a/src/manager-lib/processstatus.cpp +++ b/src/manager-lib/processstatus.cpp @@ -190,7 +190,7 @@ void ProcessStatus::setApplicationId(const QString &appId) qmlWarning(this) << "Invalid application ID:" << appId; } else { m_application = ApplicationManager::instance()->application(appIndex); - connect(m_application, &AbstractApplication::runStateChanged, this, &ProcessStatus::onRunStateChanged); + connect(m_application.data(), &AbstractApplication::runStateChanged, this, &ProcessStatus::onRunStateChanged); } } determinePid(); |