diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-08-15 13:53:28 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-08-15 13:53:28 +0200 |
| commit | db9837fa6c9401e898ac8e7492081a6e21c71790 (patch) | |
| tree | d542a089711257402ac4fe70813fa0e7de825f2e /tests/system/suite_HELP/tst_HELP04/test.py | |
| parent | 7bc14bf3498ea6b1c19abacf85a5103772da26bc (diff) | |
| parent | 58747b2de107e8f6ac00daeb431ecbf3e603fd34 (diff) | |
| download | qt-creator-db9837fa6c9401e898ac8e7492081a6e21c71790.tar.gz | |
Merge remote-tracking branch 'origin/4.7'
Conflicts:
src/plugins/clangtools/clangtoolruncontrol.cpp
src/plugins/cpptools/compileroptionsbuilder.cpp
Change-Id: Ib1e8abf066898b50c90fc1ccba4697fe983e8a8f
Diffstat (limited to 'tests/system/suite_HELP/tst_HELP04/test.py')
| -rw-r--r-- | tests/system/suite_HELP/tst_HELP04/test.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/system/suite_HELP/tst_HELP04/test.py b/tests/system/suite_HELP/tst_HELP04/test.py index 471df57378..e6ce7932d0 100644 --- a/tests/system/suite_HELP/tst_HELP04/test.py +++ b/tests/system/suite_HELP/tst_HELP04/test.py @@ -24,7 +24,6 @@ ############################################################################ source("../../shared/qtcreator.py") -import re # test search in help mode and advanced search searchKeywordDictionary={ "abundance":True, "deplmint":False, "QODBC":True, "bld":False } |