diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-19 21:54:52 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-19 21:54:53 +0200 |
| commit | 15dc8b1d8e2db00dfcbe8d7f21150658f5de45b6 (patch) | |
| tree | 6b9c908ca1cf0b1395fa91415f19b5adf8642ca7 /examples/widgets/widgets/charactermap/characterwidget.h | |
| parent | ecc83677006dc7dffcd2417b1e3cff88b0615756 (diff) | |
| parent | 6234286925153279ca259cec04429fa584187b16 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I46ec05ade1c84e61f7f45562a218aa9ff55e2975
Diffstat (limited to 'examples/widgets/widgets/charactermap/characterwidget.h')
| -rw-r--r-- | examples/widgets/widgets/charactermap/characterwidget.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/widgets/widgets/charactermap/characterwidget.h b/examples/widgets/widgets/charactermap/characterwidget.h index d12a46aa15..67ac8a30bf 100644 --- a/examples/widgets/widgets/charactermap/characterwidget.h +++ b/examples/widgets/widgets/charactermap/characterwidget.h @@ -88,9 +88,9 @@ private: void calculateSquareSize(); QFont displayFont; - int columns; - int lastKey; - int squareSize; + int columns = 16; + int lastKey = -1; + int squareSize = 0; }; //! [0] |