diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp index 1dcb2092508..da295063257 100644 --- a/src/plugins/projectexplorer/applicationlauncher.cpp +++ b/src/plugins/projectexplorer/applicationlauncher.cpp @@ -57,9 +57,11 @@ */ using namespace Utils; -using namespace ProjectExplorer::Internal; namespace ProjectExplorer { + +using namespace Internal; + namespace Internal { enum State { Inactive, Run }; diff --git a/src/plugins/projectexplorer/projectwelcomepage.cpp b/src/plugins/projectexplorer/projectwelcomepage.cpp index 9518891ece7..f1eb287048d 100644 --- a/src/plugins/projectexplorer/projectwelcomepage.cpp +++ b/src/plugins/projectexplorer/projectwelcomepage.cpp @@ -233,7 +233,10 @@ protected: class SessionDelegate : public BaseDelegate { protected: - QString entryType() override { return tr("session", "Appears in \"Open session \""); } + QString entryType() override + { + return ProjectWelcomePage::tr("session", "Appears in \"Open session \""); + } QRect toolTipArea(const QRect &itemRect, const QModelIndex &idx) const override { // in expanded state bottom contains 'Clone', 'Rename', etc links, where the tool tip @@ -413,7 +416,10 @@ private: class ProjectDelegate : public BaseDelegate { - QString entryType() override { return tr("project", "Appears in \"Open project \""); } + QString entryType() override + { + return ProjectWelcomePage::tr("project", "Appears in \"Open project \""); + } int shortcutRole() const override { return ProjectModel::ShortcutRole; } public: diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index c249d88cb3b..bd7037c575a 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -988,9 +988,9 @@ void RunControlPrivate::onWorkerStarted(RunWorker *worker) continueStart(); return; } - showError(tr("Unexpected run control state %1 when worker %2 started.") - .arg(stateName(state)) - .arg(worker->d->id)); + showError(RunControl::tr("Unexpected run control state %1 when worker %2 started.") + .arg(stateName(state)) + .arg(worker->d->id)); } void RunControlPrivate::onWorkerFailed(RunWorker *worker, const QString &msg) @@ -1576,14 +1576,14 @@ void RunWorkerPrivate::timerEvent(QTimerEvent *ev) if (startWatchdogCallback) startWatchdogCallback(); else - q->reportFailure(tr("Worker start timed out.")); + q->reportFailure(RunWorker::tr("Worker start timed out.")); return; } if (ev->timerId() == stopWatchdogTimerId) { if (stopWatchdogCallback) stopWatchdogCallback(); else - q->reportFailure(tr("Worker stop timed out.")); + q->reportFailure(RunWorker::tr("Worker stop timed out.")); return; } } diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index ebbf557d2a6..7e73c5b0c05 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -517,6 +517,8 @@ private: class PROJECTEXPLORER_EXPORT SimpleTargetRunner : public RunWorker { + Q_OBJECT + public: explicit SimpleTargetRunner(RunControl *runControl);