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

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

10 files changed, 98 insertions, 57 deletions

diff --git a/examples/widgets/widgets/charactermap/mainwindow.cpp b/examples/widgets/widgets/charactermap/mainwindow.cpp
index b0f9705c21..702b50156b 100644
--- a/examples/widgets/widgets/charactermap/mainwindow.cpp
+++ b/examples/widgets/widgets/charactermap/mainwindow.cpp
@@ -201,7 +201,7 @@ void MainWindow::findStyles(const QFont &font)
 void MainWindow::filterChanged(int f)
 {
     const QFontComboBox::FontFilter filter =
-        filterCombo->itemData(f).value<QFontComboBox::FontFilter>();
+        qvariant_cast<QFontComboBox::FontFilter>(filterCombo->itemData(f));
     fontCombo->setFontFilters(filter);
     statusBar()->showMessage(tr("%n font(s) found", nullptr, fontCombo->count()));
 }
diff --git a/examples/widgets/widgets/icons/mainwindow.cpp b/examples/widgets/widgets/icons/mainwindow.cpp
index 8e61260041..4f990f7320 100644
--- a/examples/widgets/widgets/icons/mainwindow.cpp
+++ b/examples/widgets/widgets/icons/mainwindow.cpp
@@ -361,7 +361,7 @@ QWidget *MainWindow::createImagesGroupBox()
     QVBoxLayout *layout = new QVBoxLayout(imagesGroupBox);
     layout->addWidget(imagesTable);
     return imagesGroupBox;
-//! [25]
+//! [24]
 }
 
 //! [26]
diff --git a/examples/widgets/widgets/shapedclock/shapedclock.cpp b/examples/widgets/widgets/shapedclock/shapedclock.cpp
index 3c78f4da89..673d1a218f 100644
--- a/examples/widgets/widgets/shapedclock/shapedclock.cpp
+++ b/examples/widgets/widgets/shapedclock/shapedclock.cpp
@@ -61,6 +61,7 @@
 ShapedClock::ShapedClock(QWidget *parent)
     : QWidget(parent, Qt::FramelessWindowHint | Qt::WindowSystemMenuHint)
 {
+    setAttribute(Qt::WA_TranslucentBackground);
     QTimer *timer = new QTimer(this);
     connect(timer, &QTimer::timeout, this, QOverload<>::of(&ShapedClock::update));
     timer->start(1000);
@@ -123,6 +124,10 @@ void ShapedClock::paintEvent(QPaintEvent *)
     painter.scale(side / 200.0, side / 200.0);
 
     painter.setPen(Qt::NoPen);
+    painter.setBrush(palette().window());
+    painter.drawEllipse(QPoint(0, 0), 98, 98);
+
+    painter.setPen(Qt::NoPen);
     painter.setBrush(hourColor);
 
     painter.save();
@@ -168,6 +173,6 @@ void ShapedClock::resizeEvent(QResizeEvent * /* event */)
 //! [5]
 QSize ShapedClock::sizeHint() const
 {
-    return QSize(100, 100);
+    return QSize(200, 200);
 }
 //! [5]
diff --git a/examples/widgets/widgets/styles/main.cpp b/examples/widgets/widgets/styles/main.cpp
index d340719984..471589d3ad 100644
--- a/examples/widgets/widgets/styles/main.cpp
+++ b/examples/widgets/widgets/styles/main.cpp
@@ -50,12 +50,15 @@
 
 #include <QApplication>
 
+#include "norwegianwoodstyle.h"
 #include "widgetgallery.h"
 
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(styles);
 
+    QApplication::setStyle(new NorwegianWoodStyle);
+
     QApplication app(argc, argv);
     WidgetGallery gallery;
     gallery.show();
diff --git a/examples/widgets/widgets/styles/norwegianwoodstyle.cpp b/examples/widgets/widgets/styles/norwegianwoodstyle.cpp
index 0f614a2e9a..31150cd994 100644
--- a/examples/widgets/widgets/styles/norwegianwoodstyle.cpp
+++ b/examples/widgets/widgets/styles/norwegianwoodstyle.cpp
@@ -58,45 +58,52 @@
 NorwegianWoodStyle::NorwegianWoodStyle() :
     QProxyStyle(QStyleFactory::create("windows"))
 {
+    setObjectName("NorwegianWood");
 }
 
 //! [0]
-void NorwegianWoodStyle::polish(QPalette &palette)
+QPalette NorwegianWoodStyle::standardPalette() const
 {
-    QColor brown(212, 140, 95);
-    QColor beige(236, 182, 120);
-    QColor slightlyOpaqueBlack(0, 0, 0, 63);
-
-    QImage backgroundImage(":/images/woodbackground.png");
-    QImage buttonImage(":/images/woodbutton.png");
-    QImage midImage = buttonImage.convertToFormat(QImage::Format_RGB32);
-
-    QPainter painter;
-    painter.begin(&midImage);
-    painter.setPen(Qt::NoPen);
-    painter.fillRect(midImage.rect(), slightlyOpaqueBlack);
-    painter.end();
-//! [0]
+    if (!m_standardPalette.isBrushSet(QPalette::Disabled, QPalette::Mid)) {
+        QColor brown(212, 140, 95);
+        QColor beige(236, 182, 120);
+        QColor slightlyOpaqueBlack(0, 0, 0, 63);
+
+        QImage backgroundImage(":/images/woodbackground.png");
+        QImage buttonImage(":/images/woodbutton.png");
+        QImage midImage = buttonImage.convertToFormat(QImage::Format_RGB32);
+
+        QPainter painter;
+        painter.begin(&midImage);
+        painter.setPen(Qt::NoPen);
+        painter.fillRect(midImage.rect(), slightlyOpaqueBlack);
+        painter.end();
+    //! [0]
+
+    //! [1]
+        QPalette palette(brown);
+
+        palette.setBrush(QPalette::BrightText, Qt::white);
+        palette.setBrush(QPalette::Base, beige);
+        palette.setBrush(QPalette::Highlight, Qt::darkGreen);
+        setTexture(palette, QPalette::Button, buttonImage);
+        setTexture(palette, QPalette::Mid, midImage);
+        setTexture(palette, QPalette::Window, backgroundImage);
+
+        QBrush brush = palette.window();
+        brush.setColor(brush.color().darker());
+
+        palette.setBrush(QPalette::Disabled, QPalette::WindowText, brush);
+        palette.setBrush(QPalette::Disabled, QPalette::Text, brush);
+        palette.setBrush(QPalette::Disabled, QPalette::ButtonText, brush);
+        palette.setBrush(QPalette::Disabled, QPalette::Base, brush);
+        palette.setBrush(QPalette::Disabled, QPalette::Button, brush);
+        palette.setBrush(QPalette::Disabled, QPalette::Mid, brush);
+
+        m_standardPalette = palette;
+    }
 
-//! [1]
-    palette = QPalette(brown);
-
-    palette.setBrush(QPalette::BrightText, Qt::white);
-    palette.setBrush(QPalette::Base, beige);
-    palette.setBrush(QPalette::Highlight, Qt::darkGreen);
-    setTexture(palette, QPalette::Button, buttonImage);
-    setTexture(palette, QPalette::Mid, midImage);
-    setTexture(palette, QPalette::Window, backgroundImage);
-
-    QBrush brush = palette.window();
-    brush.setColor(brush.color().darker());
-
-    palette.setBrush(QPalette::Disabled, QPalette::WindowText, brush);
-    palette.setBrush(QPalette::Disabled, QPalette::Text, brush);
-    palette.setBrush(QPalette::Disabled, QPalette::ButtonText, brush);
-    palette.setBrush(QPalette::Disabled, QPalette::Base, brush);
-    palette.setBrush(QPalette::Disabled, QPalette::Button, brush);
-    palette.setBrush(QPalette::Disabled, QPalette::Mid, brush);
+    return m_standardPalette;
 }
 //! [1]
 
diff --git a/examples/widgets/widgets/styles/norwegianwoodstyle.h b/examples/widgets/widgets/styles/norwegianwoodstyle.h
index 5a1783eb4d..62ca502d05 100644
--- a/examples/widgets/widgets/styles/norwegianwoodstyle.h
+++ b/examples/widgets/widgets/styles/norwegianwoodstyle.h
@@ -66,7 +66,8 @@ class NorwegianWoodStyle : public QProxyStyle
 public:
     NorwegianWoodStyle();
 
-    void polish(QPalette &palette) override;
+    QPalette standardPalette() const override;
+
     void polish(QWidget *widget) override;
     void unpolish(QWidget *widget) override;
     int pixelMetric(PixelMetric metric, const QStyleOption *option,
@@ -82,6 +83,7 @@ private:
     static void setTexture(QPalette &palette, QPalette::ColorRole role,
                            const QImage &image);
     static QPainterPath roundRectPath(const QRect &rect);
+    mutable QPalette m_standardPalette;
 };
 //! [0]
 
diff --git a/examples/widgets/widgets/styles/widgetgallery.cpp b/examples/widgets/widgets/styles/widgetgallery.cpp
index fd8f0ec2d1..bf8e93feb4 100644
--- a/examples/widgets/widgets/styles/widgetgallery.cpp
+++ b/examples/widgets/widgets/styles/widgetgallery.cpp
@@ -65,6 +65,7 @@
 #include <QRadioButton>
 #include <QScrollBar>
 #include <QSpinBox>
+#include <QStyle>
 #include <QStyleFactory>
 #include <QTableWidget>
 #include <QTextEdit>
@@ -74,11 +75,17 @@
 WidgetGallery::WidgetGallery(QWidget *parent)
     : QDialog(parent)
 {
-    originalPalette = QApplication::palette();
-
     styleComboBox = new QComboBox;
-    styleComboBox->addItem("NorwegianWood");
-    styleComboBox->addItems(QStyleFactory::keys());
+    const QString defaultStyleName = QApplication::style()->objectName();
+    QStringList styleNames = QStyleFactory::keys();
+    styleNames.append("NorwegianWood");
+    for (int i = 1, size = styleNames.size(); i < size; ++i) {
+        if (defaultStyleName.compare(styleNames.at(i), Qt::CaseInsensitive) == 0) {
+            styleNames.swapItemsAt(0, i);
+            break;
+        }
+    }
+    styleComboBox->addItems(styleNames);
 
     styleLabel = new QLabel(tr("&Style:"));
     styleLabel->setBuddy(styleComboBox);
@@ -134,7 +141,7 @@ WidgetGallery::WidgetGallery(QWidget *parent)
     setLayout(mainLayout);
 
     setWindowTitle(tr("Styles"));
-    changeStyle("NorwegianWood");
+    styleChanged();
 }
 //! [4]
 
@@ -142,12 +149,10 @@ WidgetGallery::WidgetGallery(QWidget *parent)
 void WidgetGallery::changeStyle(const QString &styleName)
 //! [5] //! [6]
 {
-    if (styleName == "NorwegianWood") {
+    if (styleName == "NorwegianWood")
         QApplication::setStyle(new NorwegianWoodStyle);
-    } else {
+    else
         QApplication::setStyle(QStyleFactory::create(styleName));
-    }
-    changePalette();
 }
 //! [6]
 
@@ -155,13 +160,30 @@ void WidgetGallery::changeStyle(const QString &styleName)
 void WidgetGallery::changePalette()
 //! [7] //! [8]
 {
-    if (useStylePaletteCheckBox->isChecked())
-        QApplication::setPalette(QApplication::style()->standardPalette());
-    else
-        QApplication::setPalette(originalPalette);
+    QApplication::setPalette(useStylePaletteCheckBox->isChecked() ?
+        QApplication::style()->standardPalette() : QPalette());
 }
 //! [8]
 
+void WidgetGallery::changeEvent(QEvent *event)
+{
+    if (event->type() == QEvent::StyleChange)
+        styleChanged();
+}
+
+void WidgetGallery::styleChanged()
+{
+    auto styleName = QApplication::style()->objectName();
+    for (int i = 0; i < styleComboBox->count(); ++i) {
+        if (QString::compare(styleComboBox->itemText(i), styleName, Qt::CaseInsensitive) == 0) {
+            styleComboBox->setCurrentIndex(i);
+            break;
+        }
+    }
+
+    changePalette();
+}
+
 //! [9]
 void WidgetGallery::advanceProgressBar()
 //! [9] //! [10]
diff --git a/examples/widgets/widgets/styles/widgetgallery.h b/examples/widgets/widgets/styles/widgetgallery.h
index 9ee65c21c4..8c4c880536 100644
--- a/examples/widgets/widgets/styles/widgetgallery.h
+++ b/examples/widgets/widgets/styles/widgetgallery.h
@@ -80,8 +80,12 @@ class WidgetGallery : public QDialog
 public:
     WidgetGallery(QWidget *parent = nullptr);
 
+protected:
+    void changeEvent(QEvent *) override;
+
 private slots:
     void changeStyle(const QString &styleName);
+    void styleChanged();
     void changePalette();
     void advanceProgressBar();
 
@@ -92,8 +96,6 @@ private:
     void createBottomRightGroupBox();
     void createProgressBar();
 
-    QPalette originalPalette;
-
     QLabel *styleLabel;
     QComboBox *styleComboBox;
     QCheckBox *useStylePaletteCheckBox;
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]
 
diff --git a/examples/widgets/widgets/validators/localeselector.cpp b/examples/widgets/widgets/validators/localeselector.cpp
index 1382da0cc9..3dcd04d9ff 100644
--- a/examples/widgets/widgets/validators/localeselector.cpp
+++ b/examples/widgets/widgets/validators/localeselector.cpp
@@ -90,6 +90,6 @@ void LocaleSelector::emitLocaleSelected(int index)
     QVariant v = itemData(index);
     if (!v.isValid())
         return;
-    const QLocale l = v.value<QLocale>();
+    const QLocale l = qvariant_cast<QLocale>(v);
     emit localeSelected(l);
 }