forked from qt-creator/qt-creator
Fix label inconsistency in options
Fixes: QTCREATORBUG-25540 Change-Id: I9c710dce916569813347ca60d70a1a410f4f410b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
@@ -101,10 +101,10 @@
|
|||||||
|
|
||||||
\li Select the Qt version to view and edit it.
|
\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.
|
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.
|
location.
|
||||||
|
|
||||||
\li If the Qt version is for QNX, enter the path to your installed QNX SDK in the
|
\li If the Qt version is for QNX, enter the path to your installed QNX SDK in the
|
||||||
|
|||||||
@@ -237,7 +237,7 @@ public:
|
|||||||
|
|
||||||
CMakeToolItemModel::CMakeToolItemModel()
|
CMakeToolItemModel::CMakeToolItemModel()
|
||||||
{
|
{
|
||||||
setHeader({tr("Name"), tr("Location")});
|
setHeader({tr("Name"), tr("Path")});
|
||||||
rootItem()->appendChild(
|
rootItem()->appendChild(
|
||||||
new StaticTreeItem({ProjectExplorer::Constants::msgAutoDetected()},
|
new StaticTreeItem({ProjectExplorer::Constants::msgAutoDetected()},
|
||||||
{ProjectExplorer::Constants::msgAutoDetectedToolTip()}));
|
{ProjectExplorer::Constants::msgAutoDetectedToolTip()}));
|
||||||
|
|||||||
@@ -222,7 +222,7 @@ const DebuggerItem *findDebugger(const Predicate &pred)
|
|||||||
|
|
||||||
DebuggerItemModel::DebuggerItemModel()
|
DebuggerItemModel::DebuggerItemModel()
|
||||||
{
|
{
|
||||||
setHeader({tr("Name"), tr("Location"), tr("Type")});
|
setHeader({tr("Name"), tr("Path"), tr("Type")});
|
||||||
rootItem()->appendChild(
|
rootItem()->appendChild(
|
||||||
new StaticTreeItem({ProjectExplorer::Constants::msgAutoDetected()},
|
new StaticTreeItem({ProjectExplorer::Constants::msgAutoDetected()},
|
||||||
{ProjectExplorer::Constants::msgAutoDetectedToolTip()}));
|
{ProjectExplorer::Constants::msgAutoDetectedToolTip()}));
|
||||||
|
|||||||
@@ -266,7 +266,7 @@ QtOptionsPageWidget::QtOptionsPageWidget()
|
|||||||
m_manualItem = new StaticTreeItem(ProjectExplorer::Constants::msgManual());
|
m_manualItem = new StaticTreeItem(ProjectExplorer::Constants::msgManual());
|
||||||
|
|
||||||
m_model = new TreeModel<TreeItem, TreeItem, QtVersionItem>();
|
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_autoItem);
|
||||||
m_model->rootItem()->appendChild(m_manualItem);
|
m_model->rootItem()->appendChild(m_manualItem);
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="versionNameLabel">
|
<widget class="QLabel" name="versionNameLabel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Version name:</string>
|
<string>Name:</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QLabel" name="pathLabel">
|
<widget class="QLabel" name="pathLabel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>qmake location:</string>
|
<string>qmake path:</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|||||||
Reference in New Issue
Block a user