feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Fix translation issues

Browse Source 
Add missing Q_OBJECT macro, use sensible contexts, and use "simpler"
namespace resolution (for QTBUG-64007)

Change-Id: I2417a7a40e8ba0ff4bfdff34d2a4c57d8dcdeb00
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Eike Ziller
2017-10-23 13:46:54 +02:00
committed by Tobias Hunger
parent 68589a3fbc
commit 19bb8e34f8
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -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;
}
}