Commit 9142934d authored by Eike Ziller's avatar Eike Ziller

Merge remote-tracking branch 'origin/4.0' into 4.1

 Conflicts:
	share/qtcreator/templates/wizards/classes/itemmodel/listmodel.cpp
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I0ece46a7df3b5a6e045b30db60e608212a40cc4d
parents 68e38b89 e84abe3a
......@@ -29,7 +29,7 @@ bool %{CN}::setHeaderData(int section, Qt::Orientation orientation, const QVaria
int %{CN}::rowCount(const QModelIndex &parent) const
{
if (!parent.isValid())
if (parent.isValid())
return 0;
// FIXME: Implement me!
......@@ -37,7 +37,7 @@ int %{CN}::rowCount(const QModelIndex &parent) const
int %{CN}::columnCount(const QModelIndex &parent) const
{
if (!parent.isValid())
if (parent.isValid())
return 0;
// FIXME: Implement me!
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment