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, 2 insertions, 4 deletions

diff --git a/examples/widgets/dialogs/findfiles/window.h b/examples/widgets/dialogs/findfiles/window.h
index ae4f49b726..fe217381e2 100644
--- a/examples/widgets/dialogs/findfiles/window.h
+++ b/examples/widgets/dialogs/findfiles/window.h
@@ -73,7 +73,9 @@ public:
 private slots:
     void browse();
     void find();
+    void animateFindClick();
     void openFileOfItem(int row, int column);
+    void contextMenu(const QPoint &pos);
 
 private:
     QStringList findFiles(const QStringList &files, const QString &text);
@@ -84,11 +86,7 @@ private:
     QComboBox *fileComboBox;
     QComboBox *textComboBox;
     QComboBox *directoryComboBox;
-    QLabel *fileLabel;
-    QLabel *textLabel;
-    QLabel *directoryLabel;
     QLabel *filesFoundLabel;
-    QPushButton *browseButton;
     QPushButton *findButton;
     QTableWidget *filesTable;