diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 23:30:31 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-20 23:30:31 +0100 |
| commit | e5a11fbb3251a98fafd6bebf0b6fc366acb19088 (patch) | |
| tree | 8e1bd6704205307e0a23484221ea1bb67a9f411e /tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h | |
| parent | 0646d1131b4bc65cdd9af29f4ce00fdd2398a3df (diff) | |
| parent | 76c0be34cd4ff4564693162fa7528463e23ce9d8 (diff) | |
Merge "Merge branch 'dev' into stable" into refs/staging/stable
Diffstat (limited to 'tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h')
| -rw-r--r-- | tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h index 57ec90e717..fcc6805a2f 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h @@ -79,7 +79,7 @@ protected: virtual void scrollContentsBy(qreal dx, qreal dy); void resizeEvent(QGraphicsSceneResizeEvent *event); - QSizeF sizeHint(Qt::SizeHint which, + QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const; private: |