feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Change-Id: I143aabee9c64a348f2cadb315f06648e0b7d48af
This commit is contained in:
Eike Ziller
2018-07-13 14:17:12 +02:00
parent 0374549b1e a92f39ec35
commit 2410443237
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/projecttree.cpp
View File

@@ -273,8 +273,8 @@ void ProjectTree::sessionAndTreeChanged()
void ProjectTree::collapseAll() void ProjectTree::collapseAll()
{ {
if (m_focusForContextMenu) if (auto w = Utils::findOrDefault(s_instance->m_projectTreeWidgets, &ProjectTree::hasFocus))
m_focusForContextMenu->collapseAll(); w->collapseAll();
} }
void ProjectTree::updateExternalFileWarning() void ProjectTree::updateExternalFileWarning()

9
src/shared/clang/clang_installation.pri
View File

@@ -117,6 +117,15 @@ isEmpty(LLVM_VERSION) {
"LLVM/Clang version >= 6.0.0 required, version provided: $$LLVM_VERSION") "LLVM/Clang version >= 6.0.0 required, version provided: $$LLVM_VERSION")
LLVM_VERSION = LLVM_VERSION =
} else { } 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_LIBDIR = $$quote($$system($$llvm_config --libdir, lines))
LLVM_BINDIR = $$quote($$system($$llvm_config --bindir, lines)) LLVM_BINDIR = $$quote($$system($$llvm_config --bindir, lines))
LLVM_INCLUDEPATH = $$system($$llvm_config --includedir, lines) LLVM_INCLUDEPATH = $$system($$llvm_config --includedir, lines)

1
tests/system/shared/welcome.py
View File

@@ -67,7 +67,6 @@ def switchToSubMode(subModeLabel):
return frameAndLabelFound return frameAndLabelFound
def findExampleOrTutorial(tableView, regex, verbose=False): def findExampleOrTutorial(tableView, regex, verbose=False):
model = tableView.model()
children = __childrenOfType__(tableView, 'QModelIndex') children = __childrenOfType__(tableView, 'QModelIndex')
for child in children: for child in children:
if re.match(regex, str(child.text)): if re.match(regex, str(child.text)):

4
tests/system/suite_WELP/tst_WELP03/test.py
View File

@@ -106,7 +106,7 @@ def main():
"Verifying: The project is shown in 'Edit' mode.") "Verifying: The project is shown in 'Edit' mode.")
invokeContextMenuOnProject('2dpainting', 'Close Project "2dpainting"') invokeContextMenuOnProject('2dpainting', 'Close Project "2dpainting"')
navTree = waitForObject(":Qt Creator_Utils::NavigationTreeView") 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"), test.verify(not checkIfObjectItemExists(":Qt Creator_Utils::NavigationTreeView", "2dpainting"),
"Verifying: The first example is closed.") "Verifying: The first example is closed.")
# clean up created packaging directories # clean up created packaging directories
@@ -132,7 +132,7 @@ def main():
"Verifying: The project is shown in 'Edit' mode while old project isn't.") "Verifying: The project is shown in 'Edit' mode while old project isn't.")
invokeContextMenuOnProject('addressbook', 'Close Project "addressbook"') invokeContextMenuOnProject('addressbook', 'Close Project "addressbook"')
navTree = waitForObject(":Qt Creator_Utils::NavigationTreeView") 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"), test.verify(not checkIfObjectItemExists(":Qt Creator_Utils::NavigationTreeView", "addressbook"),
"Verifying: The second example is closed.") "Verifying: The second example is closed.")
# clean up created packaging directories # clean up created packaging directories