diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-02-12 17:36:29 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-02-12 17:36:29 +0100 |
| commit | 56aadc407d7becadec794e660ae7d7c20e820e0c (patch) | |
| tree | c9aad23933bc6b0c68406e64e359f57143ef54d8 /tests/system/suite_general | |
| parent | 9926fc2ab12ccaa02b7f03b416c54cd58ef30b31 (diff) | |
| parent | 28971701fd4baa99f294d9393650b83c40754e18 (diff) | |
| download | qt-creator-56aadc407d7becadec794e660ae7d7c20e820e0c.tar.gz | |
Merge remote-tracking branch 'origin/3.3'
Conflicts:
src/plugins/debugger/watchhandler.cpp
src/plugins/projectexplorer/kitmodel.cpp
src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
src/shared/qbs
Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
Diffstat (limited to 'tests/system/suite_general')
| -rw-r--r-- | tests/system/suite_general/tst_opencreator_qbs/test.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/system/suite_general/tst_opencreator_qbs/test.py b/tests/system/suite_general/tst_opencreator_qbs/test.py index b7d363c7cc..27a70a7248 100644 --- a/tests/system/suite_general/tst_opencreator_qbs/test.py +++ b/tests/system/suite_general/tst_opencreator_qbs/test.py @@ -39,7 +39,12 @@ def main(): if not startedWithoutPluginError(): return openQbsProject(pathCreator) - progressBarWait(200000) + test.log("Start parsing project") naviTreeView = "{column='0' container=':Qt Creator_Utils::NavigationTreeView' text~='qtcreator( \[\S+\])?' type='QModelIndex'}" + ntwObject = waitForObject(naviTreeView) + if waitFor("ntwObject.model().rowCount(ntwObject) > 2", 200000): # No need to wait for C++-parsing + test.log("Parsing project done") # we only need the project + else: + test.warning("Parsing project timed out") compareProjectTree(naviTreeView, "projecttree_creator.tsv") invokeMenuItem("File", "Exit") |