diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-04-13 10:54:42 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-04-13 10:54:42 +0200 |
| commit | 428fcb476ba2c5bbe1d16dfe437e510dafce1777 (patch) | |
| tree | 10b130ef79d87dd1339004857c8f1e31e29c3f95 /tests | |
| parent | 9e29a32e1ab3af42a4d70984449ba33b3092a50b (diff) | |
| parent | f4594c922fe3ffcfaf715cf09622ba48c3d1d620 (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
src/libs/utils/settingsaccessor.cpp
src/plugins/autotest/autotestplugin.cpp
src/plugins/git/gitclient.cpp
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
src/plugins/qbsprojectmanager/qbsrunconfiguration.h
Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/system/shared/editor_utils.py | 1 | ||||
| -rw-r--r-- | tests/system/suite_general/tst_create_proj_wizard/test.py | 4 | ||||
| -rw-r--r-- | tests/unit/unittest/clang_dependency.pri | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/tests/system/shared/editor_utils.py b/tests/system/shared/editor_utils.py index 1730fed46c..e648311f76 100644 --- a/tests/system/shared/editor_utils.py +++ b/tests/system/shared/editor_utils.py @@ -362,6 +362,7 @@ def invokeFindUsage(editor, line, typeOperation, n=1): return False for i in range(n): type(editor, typeOperation) + snooze(1) invokeContextMenuItem(editor, "Find Usages") return True diff --git a/tests/system/suite_general/tst_create_proj_wizard/test.py b/tests/system/suite_general/tst_create_proj_wizard/test.py index 3882093ad2..99e41de975 100644 --- a/tests/system/suite_general/tst_create_proj_wizard/test.py +++ b/tests/system/suite_general/tst_create_proj_wizard/test.py @@ -82,10 +82,6 @@ def main(): if counter < len(qtVersionsForQuick) - 1: displayedPlatforms = __createProject__(category, template) continue - elif template.startswith("Plain C"): - handleBuildSystemVerifyKits(category, template, kits, displayedPlatforms) - continue - handleBuildSystemVerifyKits(category, template, kits, displayedPlatforms) invokeMenuItem("File", "Exit") diff --git a/tests/unit/unittest/clang_dependency.pri b/tests/unit/unittest/clang_dependency.pri index 9c2a3c57a3..e0c3b1a948 100644 --- a/tests/unit/unittest/clang_dependency.pri +++ b/tests/unit/unittest/clang_dependency.pri @@ -17,7 +17,7 @@ include(../../../src/shared/clang/clang_installation.pri) } LIBS += $$LIBTOOLING_LIBS $$LIBCLANG_LIBS - QMAKE_RPATHDIR += $$LLVM_LIBDIR + !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): QMAKE_RPATHDIR += $$LLVM_LIBDIR LLVM_CXXFLAGS ~= s,-g\d?, QMAKE_CXXFLAGS += $$LLVM_CXXFLAGS |