aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/clangtools
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2020-03-16 08:30:33 +0100
committerEike Ziller <eike.ziller@qt.io>2020-03-16 08:30:33 +0100
commit22cdc470776ec3a2447688eaca972ec018a2d024 (patch)
tree785dc530c98f7a31954ae2350ac079fb200b210c /src/plugins/clangtools
parentfc9bdf1255741f9261572d8560c6d8d1def76828 (diff)
parent3faa91945afc056a8b9ebe3d564be47d57de3576 (diff)
Merge remote-tracking branch 'origin/4.12'
Conflicts: src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp Change-Id: I4a90920e52dbbe9eb46aef3437ee3c5a6e7b31c6
Diffstat (limited to 'src/plugins/clangtools')
-rw-r--r--src/plugins/clangtools/filterdialog.ui2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/clangtools/filterdialog.ui b/src/plugins/clangtools/filterdialog.ui
index d1f4b77388..897b0e72d1 100644
--- a/src/plugins/clangtools/filterdialog.ui
+++ b/src/plugins/clangtools/filterdialog.ui
@@ -33,7 +33,7 @@
<item>
<widget class="QPushButton" name="selectWithFixits">
<property name="text">
- <string>Select All With Fixits</string>
+ <string>Select All with Fixits</string>
</property>
</widget>
</item>