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

Welcome: Squish: Assign object name to fix Squish tests

Browse Source 
Latest change of adding QScrollArea around Welcome's sidebar made
the objects lookup fragile. Using the QScrollArea inside Squish
tests helped for some but not all lookups.
Simplify the lookup by assigning an object name.

Change-Id: I5f37ee69bf20eaf02c9717cbaa5ba541d8ffbc17
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christian Stenger
2017-09-06 08:55:03 +02:00
parent ca3b882ab8
commit b381418476
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/welcome/welcomeplugin.cpp
View File

@@ -303,6 +303,7 @@ WelcomeMode::WelcomeMode()
divider->setPalette(themeColor(Theme::Welcome_DividerColor)); divider->setPalette(themeColor(Theme::Welcome_DividerColor));
m_pageStack = new QStackedWidget(m_modeWidget); m_pageStack = new QStackedWidget(m_modeWidget);
m_pageStack->setObjectName("WelcomeScreenStackedWidget");
m_pageStack->setAutoFillBackground(true); m_pageStack->setAutoFillBackground(true);
auto hbox = new QHBoxLayout; auto hbox = new QHBoxLayout;

6
tests/system/shared/welcome.py
View File

@@ -37,10 +37,8 @@ def getWelcomeScreenSideBarButton(buttonLabel):
return __getWelcomeScreenButtonHelper__(buttonLabel, sideBar) return __getWelcomeScreenButtonHelper__(buttonLabel, sideBar)
def getWelcomeScreenMainButton(buttonLabel): def getWelcomeScreenMainButton(buttonLabel):
stackedWidget = waitForObject("{type='QWidget' unnamed='1' visible='1' " stackedWidget = waitForObject("{type='QStackedWidget' name='WelcomeScreenStackedWidget' "
"leftWidget={type='QWidget' unnamed='1' visible='1' " "window=':Qt Creator_Core::Internal::MainWindow'}")
"leftWidget={type='Welcome::Internal::SideBar' unnamed='1' "
"window=':Qt Creator_Core::Internal::MainWindow'}}}")
currentStackWidget = stackedWidget.currentWidget() currentStackWidget = stackedWidget.currentWidget()
return __getWelcomeScreenButtonHelper__(buttonLabel, currentStackWidget) return __getWelcomeScreenButtonHelper__(buttonLabel, currentStackWidget)