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

Merge remote-tracking branch 'origin/4.8'

Browse Source 
Change-Id: I0ff6f659b7ccd4ff5a79e422a1d54488508fe05f
This commit is contained in:
Eike Ziller
2018-10-16 07:11:57 +02:00
parent 683e7aa6cf f612833d83
commit 511bd64f3f
100 changed files with 344 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/debugger/unstartedappwatcherdialog.cpp
View File

@@ -239,8 +239,7 @@ void UnstartedAppWatcherDialog::pidFound(const DeviceProcessItem &p)
void UnstartedAppWatcherDialog::startStopWatching(bool start)
{
setWaitingState(start ? WatchingState : NotWatchingState);
m_watchingPushButton->setText(start ? QLatin1String("Stop Watching")
: QLatin1String("Start Watching"));
m_watchingPushButton->setText(start ? tr("Stop Watching") : tr("Start Watching"));
startStopTimer(start);
}