Merge remote-tracking branch 'origin/5.7' into dev

Change-Id: I36e6b890b65d12bf6931757540bcc9c553b5eb8f

1 files changed, 3 insertions, 13 deletions

diff --git a/examples/widgets/tools/codecs/mainwindow.h b/examples/widgets/tools/codecs/mainwindow.h
index 1e8b440a02..7121c0b122 100644
--- a/examples/widgets/tools/codecs/mainwindow.h
+++ b/examples/widgets/tools/codecs/mainwindow.h
@@ -56,9 +56,8 @@
 
 QT_BEGIN_NAMESPACE
 class QAction;
-class QMenu;
 class QTextCodec;
-class QTextEdit;
+class QPlainTextEdit;
 QT_END_NAMESPACE
 class PreviewForm;
 
@@ -77,21 +76,12 @@ private slots:
 
 private:
     void findCodecs();
-    void createActions();
     void createMenus();
 
-    QTextEdit *textEdit;
+    QList<QAction *> saveAsActs;
+    QPlainTextEdit *textEdit;
     PreviewForm *previewForm;
     QList<QTextCodec *> codecs;
-
-    QMenu *fileMenu;
-    QMenu *helpMenu;
-    QMenu *saveAsMenu;
-    QAction *openAct;
-    QList<QAction *> saveAsActs;
-    QAction *exitAct;
-    QAction *aboutAct;
-    QAction *aboutQtAct;
 };
 
 #endif