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/scribble/scribblearea.cpp | |
| 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/scribble/scribblearea.cpp')
| -rw-r--r-- | examples/widgets/widgets/scribble/scribblearea.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/examples/widgets/widgets/scribble/scribblearea.cpp b/examples/widgets/widgets/scribble/scribblearea.cpp index 13e46f6e1d..75371b523f 100644 --- a/examples/widgets/widgets/scribble/scribblearea.cpp +++ b/examples/widgets/widgets/scribble/scribblearea.cpp @@ -50,7 +50,9 @@ #include "scribblearea.h" -#include <QtWidgets> +#include <QMouseEvent> +#include <QPainter> + #if defined(QT_PRINTSUPPORT_LIB) #include <QtPrintSupport/qtprintsupportglobal.h> #if QT_CONFIG(printdialog) @@ -64,10 +66,6 @@ ScribbleArea::ScribbleArea(QWidget *parent) : QWidget(parent) { setAttribute(Qt::WA_StaticContents); - modified = false; - scribbling = false; - myPenWidth = 1; - myPenColor = Qt::blue; } //! [0] @@ -98,9 +96,8 @@ bool ScribbleArea::saveImage(const QString &fileName, const char *fileFormat) if (visibleImage.save(fileName, fileFormat)) { modified = false; return true; - } else { - return false; } + return false; } //! [4] |