diff --git a/src/libs/utils/treemodel.cpp b/src/libs/utils/treemodel.cpp index d42711cf7db..dd297bb62c7 100644 --- a/src/libs/utils/treemodel.cpp +++ b/src/libs/utils/treemodel.cpp @@ -1054,6 +1054,11 @@ StaticTreeItem::StaticTreeItem(const QStringList &displays) { } +StaticTreeItem::StaticTreeItem(const QString &display) + : m_displays(display) +{ +} + QVariant StaticTreeItem::data(int column, int role) const { if (role == Qt::DisplayRole && column >= 0 && column < m_displays.size()) diff --git a/src/libs/utils/treemodel.h b/src/libs/utils/treemodel.h index 191a5e9dde4..515947c4a7f 100644 --- a/src/libs/utils/treemodel.h +++ b/src/libs/utils/treemodel.h @@ -174,6 +174,7 @@ class QTCREATOR_UTILS_EXPORT StaticTreeItem : public TreeItem { public: StaticTreeItem(const QStringList &displays); + StaticTreeItem(const QString &display); QVariant data(int column, int role) const override; Qt::ItemFlags flags(int column) const override; diff --git a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp index b686764c263..adeae906a55 100644 --- a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp +++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp @@ -142,8 +142,8 @@ public: CMakeToolItemModel::CMakeToolItemModel() { setHeader({tr("Name"), tr("Location")}); - rootItem()->appendChild(new StaticTreeItem(QStringList(tr("Auto-detected")))); - rootItem()->appendChild(new StaticTreeItem(QStringList(tr("Manual")))); + rootItem()->appendChild(new StaticTreeItem(tr("Auto-detected"))); + rootItem()->appendChild(new StaticTreeItem(tr("Manual"))); foreach (const CMakeTool *item, CMakeToolManager::cmakeTools()) addCMakeTool(item, false); diff --git a/src/plugins/projectexplorer/kitmodel.cpp b/src/plugins/projectexplorer/kitmodel.cpp index 61617810f04..da5d8472b2f 100644 --- a/src/plugins/projectexplorer/kitmodel.cpp +++ b/src/plugins/projectexplorer/kitmodel.cpp @@ -107,8 +107,8 @@ KitModel::KitModel(QBoxLayout *parentLayout, QObject *parent) m_parentLayout(parentLayout) { setHeader(QStringList(tr("Name"))); - m_autoRoot = new StaticTreeItem(QStringList(tr("Auto-detected"))); - m_manualRoot = new StaticTreeItem(QStringList(tr("Manual"))); + m_autoRoot = new StaticTreeItem(tr("Auto-detected")); + m_manualRoot = new StaticTreeItem(tr("Manual")); rootItem()->appendChild(m_autoRoot); rootItem()->appendChild(m_manualRoot); diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp index 7778d158d21..ee40edfbb0e 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.cpp +++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp @@ -114,8 +114,8 @@ public: [](ToolChainFactory *factory) { return factory->canCreate();}); m_model.setHeader({ ToolChainOptionsPage::tr("Name"), ToolChainOptionsPage::tr("Type") }); - m_autoRoot = new StaticTreeItem(QStringList(ToolChainOptionsPage::tr("Auto-detected"))); - m_manualRoot = new StaticTreeItem(QStringList(ToolChainOptionsPage::tr("Manual"))); + m_autoRoot = new StaticTreeItem(ToolChainOptionsPage::tr("Auto-detected")); + m_manualRoot = new StaticTreeItem(ToolChainOptionsPage::tr("Manual")); m_model.rootItem()->appendChild(m_autoRoot); m_model.rootItem()->appendChild(m_manualRoot); foreach (ToolChain *tc, ToolChainManager::toolChains()) { diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index e1b74a82da4..3ccfb4ada80 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -220,8 +220,8 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent) m_ui->versionInfoWidget->setWidget(versionInfoWidget); m_ui->versionInfoWidget->setState(DetailsWidget::NoSummary); - m_autoItem = new StaticTreeItem(QStringList(tr("Auto-detected"))); - m_manualItem = new StaticTreeItem(QStringList(tr("Manual" ))); + m_autoItem = new StaticTreeItem(tr("Auto-detected")); + m_manualItem = new StaticTreeItem(tr("Manual")); m_model = new LeveledTreeModel(); m_model->setHeader({tr("Name"), tr("qmake Location"), tr("Type")}); diff --git a/tests/auto/utils/treemodel/tst_treemodel.cpp b/tests/auto/utils/treemodel/tst_treemodel.cpp index e2942a51347..15dbc257038 100644 --- a/tests/auto/utils/treemodel/tst_treemodel.cpp +++ b/tests/auto/utils/treemodel/tst_treemodel.cpp @@ -53,7 +53,7 @@ static int countLevelItems(TreeItem *base, int level) static TreeItem *createItem(const QString &name) { - return new StaticTreeItem(QStringList(name)); + return new StaticTreeItem(name); } void tst_TreeModel::testIteration()