diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-08-15 14:34:25 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-08-15 14:34:25 +0200 |
| commit | 9142934d8e1cb4731db9d1b0bf76b23ea9935b18 (patch) | |
| tree | 5f23b6fb668eb1ec428eed6e00fd2ad8529e9079 /share | |
| parent | 68e38b89e38668a5570b4fc9194288abf5c86bee (diff) | |
| parent | e84abe3af1335c000b8f581c351b5e387101ea8f (diff) | |
| download | qt-creator-9142934d8e1cb4731db9d1b0bf76b23ea9935b18.tar.gz | |
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
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/templates/wizards/classes/itemmodel/tablemodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/qtcreator/templates/wizards/classes/itemmodel/tablemodel.cpp b/share/qtcreator/templates/wizards/classes/itemmodel/tablemodel.cpp index fb452feace..80bedf5899 100644 --- a/share/qtcreator/templates/wizards/classes/itemmodel/tablemodel.cpp +++ b/share/qtcreator/templates/wizards/classes/itemmodel/tablemodel.cpp @@ -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! |