From 1ed802e3b8a7f236bd277719090f461a87eae78e Mon Sep 17 00:00:00 2001
From: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Date: Wed, 22 Jan 2020 16:07:05 +0100
Subject: Doc: Update the stylesheet reference for widgets and richtext
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add the Qt-specific properites to the list.

Fixes: QTBUG-37938
Change-Id: I178de6cd5e17cd282a20ccee9ce8355f540c38a1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/widgets/doc')

diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
index c8f374a1b1..efe30308f0 100644
--- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -2526,6 +2526,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
-- 
cgit v1.2.3


From 4bb897a3841f0f79150787e29fe122e1410bc119 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 10 Jan 2020 10:08:37 +0100
Subject: Deprecate all methods that use QMatrix

Don't use QMatrix in implementation classes anymore.

Task-number: QTBUG-46653
Fixes: QTBUG-81627
Change-Id: I4806c1302e42645dc6a608062c8d9c336ae8629b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/widgets/doc/snippets/javastyle.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/widgets/doc')

diff --git a/src/widgets/doc/snippets/javastyle.cpp b/src/widgets/doc/snippets/javastyle.cpp
index 3d1b1e0030..ca6866376b 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));
-- 
cgit v1.2.3