Merge "Merge remote-tracking branch 'origin/5.15' into dev"

2 files changed, 14 insertions, 2 deletions

diff --git a/src/widgets/doc/snippets/javastyle.cpp b/src/widgets/doc/snippets/javastyle.cpp
index 54a4ade921..1d18b45c37 100644
--- a/src/widgets/doc/snippets/javastyle.cpp
+++ b/src/widgets/doc/snippets/javastyle.cpp
@@ -380,10 +380,10 @@ void JavaStyle::drawControl(ControlElement control, const QStyleOption *option,
             QRect rect = bar->rect;
             if (bar->orientation == Qt::Vertical) {
                 rect = QRect(rect.left(), rect.top(), rect.height(), rect.width());
-                QMatrix m;
+                QTransform m;
                 m.translate(rect.height()-1, 0);
                 m.rotate(90.0);
-                painter->setMatrix(m);
+                painter->setTransform(m);
             }
 
             painter->setPen(bar->palette.color(QPalette::Mid));
diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
index 35bad6786a..50f626e7a6 100644
--- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -2543,6 +2543,18 @@
 
            See also \l{#height-prop}{height}.
 
+    \row
+        \li \b -qt-background-role
+        \li \l{#paletterole}{PaletteRole}
+        \li The \c{background-color} for the subcontrol or widget based on the
+            chosen role.
+
+    \row
+        \li \b -qt-style-features
+        \li \c list
+        \li The list of CSS properties that you want to apply Qt-specific styles on.
+
+            \note The \c list can only include properties that are not pixmap-based.
     \endtable
 
     \target list of icons