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

Conflicts:
	tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp

Change-Id: I6f3878b204464313aa2f9d988d3b35121d4d9867

1 files changed, 11 insertions, 5 deletions

diff --git a/examples/widgets/tools/codecs/previewform.h b/examples/widgets/tools/codecs/previewform.h
index f3e13233b4..1846b976de 100644
--- a/examples/widgets/tools/codecs/previewform.h
+++ b/examples/widgets/tools/codecs/previewform.h
@@ -58,8 +58,10 @@ QT_BEGIN_NAMESPACE
 class QComboBox;
 class QDialogButtonBox;
 class QLabel;
+class QPlainTextEdit;
+class QPushButton;
+class QTabWidget;
 class QTextCodec;
-class QTextEdit;
 QT_END_NAMESPACE
 
 class PreviewForm : public QDialog
@@ -67,7 +69,7 @@ class PreviewForm : public QDialog
     Q_OBJECT
 
 public:
-    PreviewForm(QWidget *parent = 0);
+    explicit PreviewForm(QWidget *parent = Q_NULLPTR);
 
     void setCodecList(const QList<QTextCodec *> &list);
     void setEncodedData(const QByteArray &data);
@@ -77,13 +79,17 @@ private slots:
     void updateTextEdit();
 
 private:
+    void reset();
+
     QByteArray encodedData;
     QString decodedStr;
 
+    QPushButton *okButton;
+    QTabWidget *tabWidget;
     QComboBox *encodingComboBox;
-    QLabel *encodingLabel;
-    QTextEdit *textEdit;
-    QDialogButtonBox *buttonBox;
+    QPlainTextEdit *textEdit;
+    QPlainTextEdit *hexDumpEdit;
+    QLabel *statusLabel;
 };
 
 #endif