From 7e3cdbe548a4ef078ee636b0c464923bbbb813cd Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Tue, 10 Jul 2018 14:24:27 +0200 Subject: [PATCH 1/4] Squish: Remove unused variables Change-Id: I24d8ecbe7e7208a20d0f27f62d5b8f488d2a240a Reviewed-by: Christian Stenger --- tests/system/suite_WELP/tst_WELP03/test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py index 347d37ec1a3..86cc8c12dc9 100644 --- a/tests/system/suite_WELP/tst_WELP03/test.py +++ b/tests/system/suite_WELP/tst_WELP03/test.py @@ -106,7 +106,7 @@ def main(): "Verifying: The project is shown in 'Edit' mode.") invokeContextMenuOnProject('2dpainting', 'Close Project "2dpainting"') navTree = waitForObject(":Qt Creator_Utils::NavigationTreeView") - res = waitFor("navTree.model().rowCount(navTree.rootIndex()) == 0", 2000) + waitFor("navTree.model().rowCount(navTree.rootIndex()) == 0", 2000) test.verify(not checkIfObjectItemExists(":Qt Creator_Utils::NavigationTreeView", "2dpainting"), "Verifying: The first example is closed.") # clean up created packaging directories @@ -132,7 +132,7 @@ def main(): "Verifying: The project is shown in 'Edit' mode while old project isn't.") invokeContextMenuOnProject('addressbook', 'Close Project "addressbook"') navTree = waitForObject(":Qt Creator_Utils::NavigationTreeView") - res = waitFor("navTree.model().rowCount(navTree.rootIndex()) == 0", 2000) + waitFor("navTree.model().rowCount(navTree.rootIndex()) == 0", 2000) test.verify(not checkIfObjectItemExists(":Qt Creator_Utils::NavigationTreeView", "addressbook"), "Verifying: The second example is closed.") # clean up created packaging directories From 69f75036ab9eafa91f3321751f1ab3e5e1cf0c18 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Thu, 12 Jul 2018 13:42:02 +0200 Subject: [PATCH 2/4] Squish: Remove unneeded function call Change-Id: I3fb85bc69086501dada922b45ef353e34030e0db Reviewed-by: Christian Stenger --- tests/system/shared/welcome.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/system/shared/welcome.py b/tests/system/shared/welcome.py index dc48424a5ca..f6338a91fa5 100644 --- a/tests/system/shared/welcome.py +++ b/tests/system/shared/welcome.py @@ -67,7 +67,6 @@ def switchToSubMode(subModeLabel): return frameAndLabelFound def findExampleOrTutorial(tableView, regex, verbose=False): - model = tableView.model() children = __childrenOfType__(tableView, 'QModelIndex') for child in children: if re.match(regex, str(child.text)): From 10fc3595a314bbf5aab0514823b6516ccdb92055 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 10 Jul 2018 23:11:21 +0300 Subject: [PATCH 3/4] Clang: Suppress class-memaccess warnings for GCC8 They appear a lot in Clang headers. Until this is fixed in Clang, suppress them. Change-Id: I5292ae442089aec3f52ba846ee21e0bd9e61d0cb Reviewed-by: Oswald Buddenhagen Reviewed-by: Ivan Donchevskii --- src/shared/clang/clang_installation.pri | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index b9cc4c9704b..f9eea556062 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -107,6 +107,15 @@ isEmpty(LLVM_VERSION) { "LLVM/Clang version >= 6.0.0 required, version provided: $$LLVM_VERSION") LLVM_VERSION = } else { + # CLANG-UPGRADE-CHECK: Remove suppression if this warning is resolved. + gcc { + # GCC6 shows full version (6.4.0), while GCC7 and up show only major version (8) + GCC_VERSION = $$system("$$QMAKE_CXX -dumpversion") + GCC_MAJOR_VERSION = $$section(GCC_VERSION, ., 0, 0) + # GCC8 warns about memset/memcpy for types with copy ctor. Clang has some of these. + greaterThan(GCC_MAJOR_VERSION, 7):QMAKE_CXXFLAGS += -Wno-class-memaccess + } + LLVM_LIBDIR = $$quote($$system($$llvm_config --libdir, lines)) LLVM_BINDIR = $$quote($$system($$llvm_config --bindir, lines)) LLVM_INCLUDEPATH = $$system($$llvm_config --includedir, lines) From a92f39ec356d66681a183907288632a5779a7ab2 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 12 Jul 2018 15:51:46 +0200 Subject: [PATCH 4/4] ProjectExplorer: Make Collapse All action for project tree work Creator registers a "Collapse All" action for the Project tree. Make this work again. Task-number: QTCREATORBUG-20771 Change-Id: I49f1c8a97c4eb22ef6f7f703eefdfe46c3c0a035 Reviewed-by: Eike Ziller --- src/plugins/projectexplorer/projecttree.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/projecttree.cpp b/src/plugins/projectexplorer/projecttree.cpp index cf08af7ca25..206f158f228 100644 --- a/src/plugins/projectexplorer/projecttree.cpp +++ b/src/plugins/projectexplorer/projecttree.cpp @@ -268,8 +268,8 @@ void ProjectTree::sessionAndTreeChanged() void ProjectTree::collapseAll() { - if (m_focusForContextMenu) - m_focusForContextMenu->collapseAll(); + if (auto w = Utils::findOrDefault(s_instance->m_projectTreeWidgets, &ProjectTree::hasFocus)) + w->collapseAll(); } void ProjectTree::updateExternalFileWarning()