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

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

1 files changed, 3 insertions, 3 deletions

diff --git a/examples/widgets/widgets/tablet/mainwindow.cpp b/examples/widgets/widgets/tablet/mainwindow.cpp
index 8bcb9ada63..c5b631ee44 100644
--- a/examples/widgets/widgets/tablet/mainwindow.cpp
+++ b/examples/widgets/widgets/tablet/mainwindow.cpp
@@ -85,21 +85,21 @@ void MainWindow::setBrushColor()
 //! [2]
 void MainWindow::setAlphaValuator(QAction *action)
 {
-    m_canvas->setAlphaChannelValuator(action->data().value<TabletCanvas::Valuator>());
+    m_canvas->setAlphaChannelValuator(qvariant_cast<TabletCanvas::Valuator>(action->data()));
 }
 //! [2]
 
 //! [3]
 void MainWindow::setLineWidthValuator(QAction *action)
 {
-    m_canvas->setLineWidthType(action->data().value<TabletCanvas::Valuator>());
+    m_canvas->setLineWidthType(qvariant_cast<TabletCanvas::Valuator>(action->data()));
 }
 //! [3]
 
 //! [4]
 void MainWindow::setSaturationValuator(QAction *action)
 {
-    m_canvas->setColorSaturationValuator(action->data().value<TabletCanvas::Valuator>());
+    m_canvas->setColorSaturationValuator(qvariant_cast<TabletCanvas::Valuator>(action->data()));
 }
 //! [4]