aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2018-02-02 13:41:50 +0100
committerUlf Hermann <ulf.hermann@qt.io>2018-02-07 16:32:21 +0000
commitaa9027a1d8617b31969643c89fe92a34dbd93325 (patch)
treec5577db4f1e248278201f245202ac1492fac87a5 /tools
parent4774ada6c0ab08cf1f0a775cb6e6b1cba8c6962d (diff)
qmlprofiler tool: Fix message in interactive mode
The "Really Quit?" can be posted for more than one reason. Only repeat the last part if the user doesn't press 'y' or 'n'. Also, output an extra newline on exit, so that the shell prompt shows up again. Change-Id: Ide0372e1e11059d6b8089750f5e665f05aa60122 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlprofiler/qmlprofilerapplication.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/qmlprofiler/qmlprofilerapplication.cpp b/tools/qmlprofiler/qmlprofilerapplication.cpp
index 0b0417bd7d..3ad906c790 100644
--- a/tools/qmlprofiler/qmlprofilerapplication.cpp
+++ b/tools/qmlprofiler/qmlprofilerapplication.cpp
@@ -119,6 +119,10 @@ QmlProfilerApplication::~QmlProfilerApplication()
logStatus("Killing process ...");
m_process->kill();
}
+ if (isInteractive()) {
+ QTextStream err(stderr);
+ err << endl;
+ }
delete m_process;
}
@@ -365,7 +369,7 @@ void QmlProfilerApplication::userCommand(const QString &command)
m_pendingRequest = REQUEST_NONE;
prompt();
} else {
- prompt(tr("The application is still generating data. Really quit (y/n)?"));
+ prompt(tr("Really quit (y/n)?"));
}
return;
}