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

Conflicts:
	src/gui/kernel/qguiapplication.cpp
	src/platformsupport/input/libinput/qlibinputpointer.cpp
	src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/testlib/qtestsystem.h

Change-Id: I5975ffb3261c2dd82fe02ec4e57df7c0950226c5

1 files changed, 9 insertions, 1 deletions

diff --git a/examples/widgets/itemviews/storageview/main.cpp b/examples/widgets/itemviews/storageview/main.cpp
index c8057186fc..f349e58fad 100644
--- a/examples/widgets/itemviews/storageview/main.cpp
+++ b/examples/widgets/itemviews/storageview/main.cpp
@@ -51,6 +51,7 @@
 
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QHeaderView>
+#include <QtWidgets/QShortcut>
 #include <QtWidgets/QTreeView>
 
 #include "storagemodel.h"
@@ -60,9 +61,16 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
 
     QTreeView view;
-    view.setModel(new StorageModel(&view));
     view.resize(640, 480);
+    view.setWindowTitle("Storage View");
     view.setSelectionBehavior(QAbstractItemView::SelectRows);
+
+    StorageModel *model = new StorageModel(&view);
+    model->refresh();
+    QShortcut *refreshShortcut = new QShortcut(Qt::CTRL + Qt::Key_R, &view);
+    QObject::connect(refreshShortcut, &QShortcut::activated, model, &StorageModel::refresh);
+    view.setModel(model);
+
     int columnCount = view.model()->columnCount();
     for (int c = 0; c < columnCount; ++c)
         view.resizeColumnToContents(c);