From 8187c6a14628a7411eb8d20c0cd9462c3fb316e9 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 15 Dec 2017 07:43:49 +0100 Subject: [PATCH] Squish: Assign custom name to distinguish main tabbar from others If the settings dialog contains more than one visible tabbar when trying to access its tabs Squish fails to distinguish them. Assign a unique name for the main tabbar of a category inside the settings dialog. Change-Id: I349b480871306784b5adc9858984933dc26d7958 Reviewed-by: Robert Loehning --- src/plugins/coreplugin/dialogs/settingsdialog.cpp | 1 + tests/system/objects.map | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp index 4d1aea8fd92..decd9c64caa 100644 --- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp @@ -563,6 +563,7 @@ void SettingsDialog::ensureCategoryWidget(Category *category) m_model->ensurePages(category); QTabWidget *tabWidget = new QTabWidget; + tabWidget->tabBar()->setObjectName("qc_settings_main_tabbar"); // easier lookup in Squish for (int j = 0; j < category->pages.size(); ++j) { IOptionsPage *page = category->pages.at(j); QWidget *widget = page->widget(); diff --git a/tests/system/objects.map b/tests/system/objects.map index 02020a785f4..15cc0a2bc8c 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -104,7 +104,7 @@ :Options.Cancel_QPushButton {text='Cancel' type='QPushButton' unnamed='1' visible='1' window=':Options_Core::Internal::SettingsDialog'} :Options.OK_QPushButton {text='OK' type='QPushButton' unnamed='1' visible='1' window=':Options_Core::Internal::SettingsDialog'} :Options.qt_tabwidget_stackedwidget_QStackedWidget {name='qt_tabwidget_stackedwidget' type='QStackedWidget' visible='1' window=':Options_Core::Internal::SettingsDialog'} -:Options.qt_tabwidget_tabbar_QTabBar {name='qt_tabwidget_tabbar' type='QTabBar' visible='1' window=':Options_Core::Internal::SettingsDialog'} +:Options.qt_tabwidget_tabbar_QTabBar {name='qc_settings_main_tabbar' type='QTabBar' visible='1' window=':Options_Core::Internal::SettingsDialog'} :Options_Core::Internal::SettingsDialog {type='Core::Internal::SettingsDialog' unnamed='1' visible='1' windowTitle~='(Options|Preferences)'} :Options_QListView {type='QListView' unnamed='1' visible='1' window=':Options_Core::Internal::SettingsDialog'} :PasteSelectDialog.Cancel_QPushButton {text='Cancel' type='QPushButton' unnamed='1' visible='1' window=':PasteSelectDialog_CodePaster::PasteSelectDialog'}