diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:37:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:58:32 +0200 |
| commit | 01bc69f99f189b03d0b9cad77cc300798937cad1 (patch) | |
| tree | 730f3b691cfc1830ec617b3c2ad8df16180de724 /examples/sql/drilldown/imageitem.h | |
| parent | c23c4a921d0e9e2d18a62af82d38ca27eac7bcb3 (diff) | |
| parent | 6d699d08200b1fe3a616dfbc275d46c98b77fcbd (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/plugins/styles/mac/qmacstyle_mac.mm
src/widgets/util/qcompleter.cpp
src/widgets/widgets/qmainwindowlayout.cpp
src/widgets/widgets/qmdisubwindow.cpp
Change-Id: If0e96981af07ce36ac68f2e69211bc2120f93973
Diffstat (limited to 'examples/sql/drilldown/imageitem.h')
| -rw-r--r-- | examples/sql/drilldown/imageitem.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/sql/drilldown/imageitem.h b/examples/sql/drilldown/imageitem.h index 4f773a6dfc..abb9103c7e 100644 --- a/examples/sql/drilldown/imageitem.h +++ b/examples/sql/drilldown/imageitem.h @@ -60,10 +60,10 @@ class ImageItem : public QObject, public QGraphicsPixmapItem Q_OBJECT public: - ImageItem(int id, const QPixmap &pixmap, QGraphicsItem *parent = 0); + ImageItem(int id, const QPixmap &pixmap, QGraphicsItem *parent = nullptr); void adjust(); - int id(); + int id() const; protected: void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; |