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, 3 insertions, 3 deletions

diff --git a/examples/widgets/widgets/charactermap/mainwindow.h b/examples/widgets/widgets/charactermap/mainwindow.h
index 2865eacc00..eac16b35fa 100644
--- a/examples/widgets/widgets/charactermap/mainwindow.h
+++ b/examples/widgets/widgets/charactermap/mainwindow.h
@@ -73,18 +73,18 @@ public:
     MainWindow();
 
 public slots:
+    void filterChanged(int);
     void findStyles(const QFont &font);
     void findSizes(const QFont &font);
     void insertCharacter(const QString &character);
 #ifndef QT_NO_CLIPBOARD
     void updateClipboard();
 #endif
+    void showInfo();
 
 private:
     CharacterWidget *characterWidget;
-#ifndef QT_NO_CLIPBOARD
-    QClipboard *clipboard;
-#endif
+    QComboBox *filterCombo;
     QComboBox *styleCombo;
     QComboBox *sizeCombo;
     QFontComboBox *fontCombo;