diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-17 07:11:26 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-17 07:12:23 +0100 |
| commit | f596553e03c3969f6e7cb5344c05591da6e70dfb (patch) | |
| tree | 8aef667749e1adc015cbc9c5ec5b5af9c6d4c15c /examples/quick | |
| parent | e32845b137834ef46d68345a0029d4af7c1d85bb (diff) | |
| parent | 7030adff1869e850a7b983e88d7a773d5d594886 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
src/imports/dialogs/DefaultFileDialog.qml
src/imports/widgets/qquickqfiledialog.cpp
Change-Id: I00de6dd05cb773f01254061d585a82c90b229acd
Diffstat (limited to 'examples/quick')
| -rw-r--r-- | examples/quick/models/abstractitemmodel/model.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/quick/models/abstractitemmodel/model.cpp b/examples/quick/models/abstractitemmodel/model.cpp index 724e2ed779..30eff6a7c0 100644 --- a/examples/quick/models/abstractitemmodel/model.cpp +++ b/examples/quick/models/abstractitemmodel/model.cpp @@ -67,6 +67,7 @@ void AnimalModel::addAnimal(const Animal &animal) } int AnimalModel::rowCount(const QModelIndex & parent) const { + Q_UNUSED(parent); return m_animals.count(); } |