summaryrefslogtreecommitdiffstats
path: root/src/widgets/doc/snippets/styles/styles.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-08-17 09:08:04 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-08-17 09:08:06 +0200
commit8842d9d1e6c0286922bf18357ca30c146d692316 (patch)
tree93b78c4f8dcb21275517f94da2ccc4500005e8c2 /src/widgets/doc/snippets/styles/styles.cpp
parent67352c92761fcb2e2c6a98b24e1bf5f33805cb3a (diff)
parent29778037f8a7b2c86bc4044409b37d5a51a15432 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'src/widgets/doc/snippets/styles/styles.cpp')
-rw-r--r--src/widgets/doc/snippets/styles/styles.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/doc/snippets/styles/styles.cpp b/src/widgets/doc/snippets/styles/styles.cpp
index 116c807f39..77fde0693d 100644
--- a/src/widgets/doc/snippets/styles/styles.cpp
+++ b/src/widgets/doc/snippets/styles/styles.cpp
@@ -55,7 +55,7 @@
class MyWidget : public QWidget
{
protected:
- void paintEvent(QPaintEvent *event);
+ void paintEvent(QPaintEvent *event) override;
void paintEvent2(QPaintEvent *event);
};