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

 Conflicts:
	src/corelib/thread/qsemaphore.cpp
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp

Change-Id: Id35b535e88df63fdfe4007ea92ed4a39c4b6d707

2 files changed, 11 insertions, 0 deletions

diff --git a/examples/widgets/widgets/tablet/mainwindow.cpp b/examples/widgets/widgets/tablet/mainwindow.cpp
index c02e02f0a4..994666d4de 100644
--- a/examples/widgets/widgets/tablet/mainwindow.cpp
+++ b/examples/widgets/widgets/tablet/mainwindow.cpp
@@ -60,6 +60,7 @@ MainWindow::MainWindow(TabletCanvas *canvas)
     createMenus();
     setWindowTitle(tr("Tablet Example"));
     setCentralWidget(m_canvas);
+    QCoreApplication::setAttribute(Qt::AA_CompressHighFrequencyEvents);
 }
 //! [0]
 
@@ -97,6 +98,11 @@ void MainWindow::setSaturationValuator(QAction *action)
 }
 //! [4]
 
+void MainWindow::setEventCompression(bool compress)
+{
+    QCoreApplication::setAttribute(Qt::AA_CompressTabletEvents, compress);
+}
+
 //! [5]
 void MainWindow::save()
 {
@@ -220,6 +226,10 @@ void MainWindow::createMenus()
     connect(colorSaturationGroup, &QActionGroup::triggered,
             this, &MainWindow::setSaturationValuator);
 
+    QAction *compressAction = tabletMenu->addAction(tr("Co&mpress events"));
+    compressAction->setCheckable(true);
+    connect(compressAction, &QAction::toggled, this, &MainWindow::setEventCompression);
+
     QMenu *helpMenu = menuBar()->addMenu("&Help");
     helpMenu->addAction(tr("A&bout"), this, &MainWindow::about);
     helpMenu->addAction(tr("About &Qt"), qApp, &QApplication::aboutQt);
diff --git a/examples/widgets/widgets/tablet/mainwindow.h b/examples/widgets/widgets/tablet/mainwindow.h
index 68af1f1687..4b99324f04 100644
--- a/examples/widgets/widgets/tablet/mainwindow.h
+++ b/examples/widgets/widgets/tablet/mainwindow.h
@@ -71,6 +71,7 @@ private slots:
     void setAlphaValuator(QAction *action);
     void setLineWidthValuator(QAction *action);
     void setSaturationValuator(QAction *action);
+    void setEventCompression(bool compress);
     void save();
     void load();
     void about();