diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-04 13:50:57 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-04 14:13:39 +0100 |
commit | 6722bbbf4ea2ddcdd9194f26a883029ec3afc39a (patch) | |
tree | c3290b82fac21c4990be8472ae6cb4ca043205cf /examples/webenginewidgets/contentmanipulation/mainwindow.h | |
parent | 41d69eb0fa2375f0da6ba9b35136f5598be4b3a4 (diff) | |
parent | 82f4d13a13b40d9cb7710f6dd4190175a272a394 (diff) |
Merge branch '5.6' into dev
Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0
Diffstat (limited to 'examples/webenginewidgets/contentmanipulation/mainwindow.h')
-rw-r--r-- | examples/webenginewidgets/contentmanipulation/mainwindow.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/examples/webenginewidgets/contentmanipulation/mainwindow.h b/examples/webenginewidgets/contentmanipulation/mainwindow.h index 65a6cc6c2..66512f969 100644 --- a/examples/webenginewidgets/contentmanipulation/mainwindow.h +++ b/examples/webenginewidgets/contentmanipulation/mainwindow.h @@ -55,7 +55,6 @@ class QWebEngineView; class QLineEdit; QT_END_NAMESPACE -//! [1] class MainWindow : public QMainWindow { Q_OBJECT @@ -86,5 +85,4 @@ private: QLineEdit *locationEdit; QAction *rotateAction; int progress; -//! [1] }; |