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

Merge remote-tracking branch 'origin/4.3'

Browse Source 
Conflicts:
	src/plugins/genericprojectmanager/genericproject.cpp
	src/plugins/genericprojectmanager/genericproject.h
	src/plugins/genericprojectmanager/genericprojectnodes.cpp
	src/plugins/genericprojectmanager/genericprojectnodes.h

Change-Id: Ie0c870f68c8d200a75489b75860987655b2f6175
This commit is contained in:
Eike Ziller
2017-04-19 09:56:14 +02:00
parent 8b6eb5aabb 01b2ed7904
commit 88897f3a87
232 changed files with 3919 additions and 1830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/valgrind/callgrind/callgrindproxymodel.cpp
View File

@@ -121,14 +121,17 @@ bool DataProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_
const Function *func = source_index.data(DataModel::FunctionRole).value<const Function *>();
if (!func)
return false;
// check if func is located in the specific base directory, if any
if (func && !m_baseDir.isEmpty()) {
if (!m_baseDir.isEmpty()) {
if (!func->location().startsWith(m_baseDir))
return false;
}
// check if the function from this index is a child of (called by) the filter function
if (func && m_function) {
if (m_function) {
bool isValid = false;
foreach (const FunctionCall *call, func->incomingCalls()) {
if (call->caller() == m_function) {