diff options
| author | Robert Loehning <robert.loehning@digia.com> | 2013-09-18 19:15:51 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@digia.com> | 2013-09-20 11:54:56 +0200 |
| commit | 5d1aece721cc75c40f6e784d7e2c0d98a749ee49 (patch) | |
| tree | 44281bbb847b95ec3f02900e837a381575d4e790 | |
| parent | 0e0d8eb7bb0664b315c2d19c5589c24f3bbcaec4 (diff) | |
| download | qt-creator-5d1aece721cc75c40f6e784d7e2c0d98a749ee49.tar.gz | |
Squish: Fix tst_default_settings
Change-Id: I2b9e03d77df657b107bc81d3b8f16720c25b4a0e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
| -rw-r--r-- | tests/system/objects.map | 2 | ||||
| -rw-r--r-- | tests/system/suite_general/tst_default_settings/test.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/system/objects.map b/tests/system/objects.map index 7c70865b96..26dff6f71b 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -49,6 +49,8 @@ :CodePaster__Internal__PasteSelectDialog.listWidget_QListWidget {name='listWidget' type='QListWidget' visible='1' window=':CodePaster__Internal__PasteSelectDialog_CodePaster::PasteSelectDialog'} :CodePaster__Internal__PasteSelectDialog.protocolBox_QComboBox {name='protocolBox' type='QComboBox' visible='1' window=':CodePaster__Internal__PasteSelectDialog_CodePaster::PasteSelectDialog'} :CodePaster__Internal__PasteSelectDialog_CodePaster::PasteSelectDialog {name='CodePaster__Internal__PasteSelectDialog' type='CodePaster::PasteSelectDialog' visible='1'} +:Compiler:_QComboBox {aboveWidget=':CompilerPath.Utils_BaseValidatingLineEdit' container=':qt_tabwidget_stackedwidget_QWidget' leftWidget=':Compiler:_QLabel' type='QComboBox' unnamed='1' visible='1'} +:Compiler:_QLabel {container=':qt_tabwidget_stackedwidget_QWidget' text='Compiler:' type='QLabel' unnamed='1' visible='1'} :CompilerPath.Utils_BaseValidatingLineEdit {container=':qt_tabwidget_stackedwidget_QWidget' name='LineEdit' type='Utils::BaseValidatingLineEdit' visible='1'} :Core__Internal__GeneralSettings.User Interface_QGroupBox {container=':qt_tabwidget_stackedwidget.Core__Internal__GeneralSettings_QWidget' name='interfaceBox' title='User Interface' type='QGroupBox' visible='1'} :CppTools__Internal__CompletionSettingsPage.Behavior_QGroupBox {container=':qt_tabwidget_stackedwidget.CppTools__Internal__CompletionSettingsPage_QWidget' name='groupBox' title='Behavior' type='QGroupBox' visible='1'} diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py index ab8e02fc30..a81a6b54a0 100644 --- a/tests/system/suite_general/tst_default_settings/test.py +++ b/tests/system/suite_general/tst_default_settings/test.py @@ -133,8 +133,7 @@ def __kitFunc__(it, foundQt, foundCompNames): test.compare(it, "Desktop (default)", "Verifying whether default Desktop kit has been created.") if foundQt: test.compare(qtVersionStr, foundQt, "Verifying if Qt versions match.") - compilerCombo = waitForObject("{occurrence='3' type='QComboBox' unnamed='1' visible='1' " - "window=':Qt Creator_Core::Internal::MainWindow'}") + compilerCombo = waitForObject(":Compiler:_QComboBox") test.verify(str(compilerCombo.currentText) in foundCompNames, "Verifying if one of the found compilers had been set.") if currentSelectedTreeItem: |