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

Fix label inconsistency in options

Browse Source 
Fixes: QTCREATORBUG-25540
Change-Id: I9c710dce916569813347ca60d70a1a410f4f410b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Eike Ziller
2021-04-07 16:28:45 +02:00
parent ff46422b3e
commit d01c86d36d
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc
View File

@@ -101,10 +101,10 @@
\li Select the Qt version to view and edit it.
\li In the \uicontrol{Version name} field, edit the name that \QC
\li In the \uicontrol{Name} field, edit the name that \QC
suggests for the Qt version.
\li In the \uicontrol{qmake location} field, you can change the qmake
\li In the \uicontrol{qmake path} field, you can change the qmake
location.
\li If the Qt version is for QNX, enter the path to your installed QNX SDK in the

2
src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
View File

@@ -237,7 +237,7 @@ public:
CMakeToolItemModel::CMakeToolItemModel()
{
setHeader({tr("Name"), tr("Location")});
setHeader({tr("Name"), tr("Path")});
rootItem()->appendChild(
new StaticTreeItem({ProjectExplorer::Constants::msgAutoDetected()},
{ProjectExplorer::Constants::msgAutoDetectedToolTip()}));

2
src/plugins/debugger/debuggeritemmanager.cpp
View File

@@ -222,7 +222,7 @@ const DebuggerItem *findDebugger(const Predicate &pred)
DebuggerItemModel::DebuggerItemModel()
{
setHeader({tr("Name"), tr("Location"), tr("Type")});
setHeader({tr("Name"), tr("Path"), tr("Type")});
rootItem()->appendChild(
new StaticTreeItem({ProjectExplorer::Constants::msgAutoDetected()},
{ProjectExplorer::Constants::msgAutoDetectedToolTip()}));

2
src/plugins/qtsupport/qtoptionspage.cpp
View File

@@ -266,7 +266,7 @@ QtOptionsPageWidget::QtOptionsPageWidget()
m_manualItem = new StaticTreeItem(ProjectExplorer::Constants::msgManual());
m_model = new TreeModel<TreeItem, TreeItem, QtVersionItem>();
m_model->setHeader({tr("Name"), tr("qmake Location")});
m_model->setHeader({tr("Name"), tr("qmake Path")});
m_model->rootItem()->appendChild(m_autoItem);
m_model->rootItem()->appendChild(m_manualItem);

4
src/plugins/qtsupport/qtversioninfo.ui
View File

@@ -29,7 +29,7 @@
<item row="0" column="0">
<widget class="QLabel" name="versionNameLabel">
<property name="text">
<string>Version name:</string>
<string>Name:</string>
</property>
</widget>
</item>
@@ -39,7 +39,7 @@
<item row="1" column="0">
<widget class="QLabel" name="pathLabel">
<property name="text">
<string>qmake location:</string>
<string>qmake path:</string>
</property>
</widget>
</item>