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

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

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

Change-Id: I0ece46a7df3b5a6e045b30db60e608212a40cc4d
This commit is contained in:
Eike Ziller
2016-08-15 14:34:25 +02:00
parent 68e38b89e3 e84abe3af1
commit 9142934d8e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/templates/wizards/classes/itemmodel/tablemodel.cpp
View File

@@ -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!