summaryrefslogtreecommitdiffstats
path: root/src/gui/doc
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/gui/doc
parent67352c92761fcb2e2c6a98b24e1bf5f33805cb3a (diff)
parent29778037f8a7b2c86bc4044409b37d5a51a15432 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'src/gui/doc')
-rw-r--r--src/gui/doc/snippets/draganddrop/dragwidget.h8
-rw-r--r--src/gui/doc/snippets/dragging/mainwindow.h2
-rw-r--r--src/gui/doc/snippets/dropevents/window.h4
-rw-r--r--src/gui/doc/snippets/droprectangle/window.h4
-rw-r--r--src/gui/doc/snippets/matrix/matrix.cpp6
-rw-r--r--src/gui/doc/snippets/plaintextlayout/window.h2
-rw-r--r--src/gui/doc/snippets/qfileopenevent/main.cpp2
-rw-r--r--src/gui/doc/snippets/separations/finalwidget.h4
-rw-r--r--src/gui/doc/snippets/textdocument-imagedrop/textedit.h4
-rw-r--r--src/gui/doc/snippets/transform/main.cpp6
10 files changed, 21 insertions, 21 deletions
diff --git a/src/gui/doc/snippets/draganddrop/dragwidget.h b/src/gui/doc/snippets/draganddrop/dragwidget.h
index 424c0b334b..709f9338bf 100644
--- a/src/gui/doc/snippets/draganddrop/dragwidget.h
+++ b/src/gui/doc/snippets/draganddrop/dragwidget.h
@@ -74,10 +74,10 @@ signals:
void mimeTypes(const QStringList &types);
protected:
- void dragEnterEvent(QDragEnterEvent *event);
- void dropEvent(QDropEvent *event);
- void mouseMoveEvent(QMouseEvent *event);
- void mousePressEvent(QMouseEvent *event);
+ void dragEnterEvent(QDragEnterEvent *event) override;
+ void dropEvent(QDropEvent *event) override;
+ void mouseMoveEvent(QMouseEvent *event) override;
+ void mousePressEvent(QMouseEvent *event) override;
private:
QByteArray data;
diff --git a/src/gui/doc/snippets/dragging/mainwindow.h b/src/gui/doc/snippets/dragging/mainwindow.h
index 5e796d530f..8a8e43b223 100644
--- a/src/gui/doc/snippets/dragging/mainwindow.h
+++ b/src/gui/doc/snippets/dragging/mainwindow.h
@@ -68,7 +68,7 @@ public:
MainWindow(QWidget *parent = 0);
protected:
- void mousePressEvent(QMouseEvent *event);
+ void mousePressEvent(QMouseEvent *event) override;
private:
QLabel *iconLabel;
diff --git a/src/gui/doc/snippets/dropevents/window.h b/src/gui/doc/snippets/dropevents/window.h
index 17c323b952..6ac35181ed 100644
--- a/src/gui/doc/snippets/dropevents/window.h
+++ b/src/gui/doc/snippets/dropevents/window.h
@@ -67,8 +67,8 @@ public:
Window(QWidget *parent = 0);
protected:
- void dragEnterEvent(QDragEnterEvent *event);
- void dropEvent(QDropEvent *event);
+ void dragEnterEvent(QDragEnterEvent *event) override;
+ void dropEvent(QDropEvent *event) override;
private:
QComboBox *mimeTypeCombo;
diff --git a/src/gui/doc/snippets/droprectangle/window.h b/src/gui/doc/snippets/droprectangle/window.h
index 683e5cb813..5a9ef75d3b 100644
--- a/src/gui/doc/snippets/droprectangle/window.h
+++ b/src/gui/doc/snippets/droprectangle/window.h
@@ -67,8 +67,8 @@ public:
Window(QWidget *parent = 0);
protected:
- void dragMoveEvent(QDragMoveEvent *event);
- void dropEvent(QDropEvent *event);
+ void dragMoveEvent(QDragMoveEvent *event) override;
+ void dropEvent(QDropEvent *event) override;
private:
QComboBox *mimeTypeCombo;
diff --git a/src/gui/doc/snippets/matrix/matrix.cpp b/src/gui/doc/snippets/matrix/matrix.cpp
index ec9e130a29..115dc3d508 100644
--- a/src/gui/doc/snippets/matrix/matrix.cpp
+++ b/src/gui/doc/snippets/matrix/matrix.cpp
@@ -53,7 +53,7 @@
class SimpleTransformation : public QWidget
{
- void paintEvent(QPaintEvent *);
+ void paintEvent(QPaintEvent *) override;
};
//! [0]
@@ -73,7 +73,7 @@ void SimpleTransformation::paintEvent(QPaintEvent *)
class CombinedTransformation : public QWidget
{
- void paintEvent(QPaintEvent *);
+ void paintEvent(QPaintEvent *) override;
};
//! [1]
@@ -97,7 +97,7 @@ void CombinedTransformation::paintEvent(QPaintEvent *)
class BasicOperations : public QWidget
{
- void paintEvent(QPaintEvent *);
+ void paintEvent(QPaintEvent *) override;
};
//! [2]
diff --git a/src/gui/doc/snippets/plaintextlayout/window.h b/src/gui/doc/snippets/plaintextlayout/window.h
index 0068a37482..8552ecd4ba 100644
--- a/src/gui/doc/snippets/plaintextlayout/window.h
+++ b/src/gui/doc/snippets/plaintextlayout/window.h
@@ -61,7 +61,7 @@ public:
Window(QWidget *parent = 0);
protected:
- void paintEvent(QPaintEvent *event);
+ void paintEvent(QPaintEvent *event) override;
private:
QFont font;
diff --git a/src/gui/doc/snippets/qfileopenevent/main.cpp b/src/gui/doc/snippets/qfileopenevent/main.cpp
index 3e707f2ddf..f18e763bbc 100644
--- a/src/gui/doc/snippets/qfileopenevent/main.cpp
+++ b/src/gui/doc/snippets/qfileopenevent/main.cpp
@@ -61,7 +61,7 @@ public:
{
}
- bool event(QEvent *event)
+ bool event(QEvent *event) override
{
if (event->type() == QEvent::FileOpen) {
QFileOpenEvent *openEvent = static_cast<QFileOpenEvent *>(event);
diff --git a/src/gui/doc/snippets/separations/finalwidget.h b/src/gui/doc/snippets/separations/finalwidget.h
index 0301f68fe9..886a5dfaf3 100644
--- a/src/gui/doc/snippets/separations/finalwidget.h
+++ b/src/gui/doc/snippets/separations/finalwidget.h
@@ -71,8 +71,8 @@ public:
const QPixmap *pixmap() const;
protected:
- void mouseMoveEvent(QMouseEvent *event);
- void mousePressEvent(QMouseEvent *event);
+ void mouseMoveEvent(QMouseEvent *event) override;
+ void mousePressEvent(QMouseEvent *event) override;
private:
void createImage();
diff --git a/src/gui/doc/snippets/textdocument-imagedrop/textedit.h b/src/gui/doc/snippets/textdocument-imagedrop/textedit.h
index 9f73bceeaf..3f570884ba 100644
--- a/src/gui/doc/snippets/textdocument-imagedrop/textedit.h
+++ b/src/gui/doc/snippets/textdocument-imagedrop/textedit.h
@@ -59,8 +59,8 @@ class TextEdit : public QTextEdit
public:
TextEdit(QWidget *parent=0);
- bool canInsertFromMimeData( const QMimeData *source ) const;
- void insertFromMimeData( const QMimeData *source );
+ bool canInsertFromMimeData( const QMimeData *source ) const override;
+ void insertFromMimeData( const QMimeData *source ) override;
};
#endif
diff --git a/src/gui/doc/snippets/transform/main.cpp b/src/gui/doc/snippets/transform/main.cpp
index e096eee7fc..e30a3b63bf 100644
--- a/src/gui/doc/snippets/transform/main.cpp
+++ b/src/gui/doc/snippets/transform/main.cpp
@@ -53,7 +53,7 @@
class SimpleTransformation : public QWidget
{
- void paintEvent(QPaintEvent *);
+ void paintEvent(QPaintEvent *) override;
};
//! [0]
@@ -73,7 +73,7 @@ void SimpleTransformation::paintEvent(QPaintEvent *)
class CombinedTransformation : public QWidget
{
- void paintEvent(QPaintEvent *);
+ void paintEvent(QPaintEvent *) override;
};
//! [1]
@@ -97,7 +97,7 @@ void CombinedTransformation::paintEvent(QPaintEvent *)
class BasicOperations : public QWidget
{
- void paintEvent(QPaintEvent *);
+ void paintEvent(QPaintEvent *) override;
};
//! [2]