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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	qtcreator.qbp
	src/plugins/qtsupport/baseqtversion.cpp
	src/tools/tools.pro

Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
This commit is contained in:
Eike Ziller
2012-09-26 10:01:04 +02:00
parent 996122b7e9 471f44aae3
commit a55d47544a
145 changed files with 4530 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp
View File

@@ -87,7 +87,7 @@ QModelIndex ErrorListModel::index(int row, int column, const QModelIndex &parent
QTC_ASSERT(parent.model() == this, qt_noop());
return QModelIndex();
}
return createIndex(row, column, 0);
return createIndex(row, column);
}
QModelIndex ErrorListModel::parent(const QModelIndex &child) const

2
src/plugins/valgrind/xmlprotocol/stackmodel.cpp
View File

@@ -192,7 +192,7 @@ QModelIndex StackModel::parent(const QModelIndex &child) const
{
QTC_ASSERT(!child.isValid() || child.model() == this, return QModelIndex());
if (child.internalId() == -1)
if (quintptr(child.internalId()) == quintptr(-1))
return QModelIndex();
return createIndex(child.internalId(), 0, -1);
}