summaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorJose Fonseca <jfonseca@vmware.com>2017-04-11 13:51:04 +0100
committerJose Fonseca <jfonseca@vmware.com>2017-04-11 13:53:47 +0100
commitf99bf0db20e0bffa6a69ee0f47f131fbddbcadaf (patch)
tree6b943f83397d22ef34adbca4d028304075320fd6 /gui
parent038054be03e376671ae8a4b888dc98fdbfa3091d (diff)
cli: Remove trim-auto.
Per https://lists.freedesktop.org/archives/apitrace/2017-April/001215.html Actually the GUI was incorrectly using trim-auto. This was a mistake from my d9809aa93ce4bdeb57f1ab81decea4b54cf20026 commit.
Diffstat (limited to 'gui')
-rw-r--r--gui/trimprocess.cpp2
-rw-r--r--gui/ui/mainwindow.ui2
2 files changed, 2 insertions, 2 deletions
diff --git a/gui/trimprocess.cpp b/gui/trimprocess.cpp
index 854ef88f..34639c63 100644
--- a/gui/trimprocess.cpp
+++ b/gui/trimprocess.cpp
@@ -60,7 +60,7 @@ void TrimProcess::start()
QString callSetArgument = callSetFormat
.arg(m_trimIndex);
- arguments << QLatin1String("trim-auto");
+ arguments << QLatin1String("trim");
arguments << outputArgument;
arguments << callSetArgument;
arguments << m_tracePath;
diff --git a/gui/ui/mainwindow.ui b/gui/ui/mainwindow.ui
index 88209500..a33430e2 100644
--- a/gui/ui/mainwindow.ui
+++ b/gui/ui/mainwindow.ui
@@ -684,7 +684,7 @@
</action>
<action name="actionTrim">
<property name="text">
- <string>Tr&amp;im (experimental)</string>
+ <string>Tr&amp;im</string>
</property>
<property name="shortcut">
<string>Ctrl+I</string>