From 1c959c35234838cbb69f676cd96e27dc30bd85c1 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Tue, 10 Aug 2010 12:46:41 +0200
Subject: Doc: Adding radius support for CSS3 and webkit

---
 doc/src/template/style/style.css | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 9b37693..d6b0fda 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -114,6 +114,8 @@
     {
         border: 1px solid #DDDDDD;
 		-moz-border-radius: 7px 7px 7px 7px;
+		-webkit-border-radius: 7px 7px 7px 7px;
+		border-radius: 7px 7px 7px 7px;
         margin: 0 20px 10px 10px;
         padding: 20px 15px 20px 20px;
         overflow-x: auto;
@@ -121,6 +123,8 @@
     table, pre
     {
         -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
         background-color: #F6F6F6;
         border: 1px solid #E6E6E6;
         border-collapse: separate;
@@ -855,6 +859,8 @@
 	background-color:#F6F6F6;
 	border:1px solid #E6E6E6;
 	-moz-border-radius: 7px 7px 7px 7px;
+	border-radius: 7px 7px 7px 7px;
+	-webkit-border-radius: 7px 7px 7px 7px;
 	font-size:12pt;
 	padding-left:10px;
 	margin-top:10px;
@@ -911,6 +917,8 @@
     {
         display: none;
         -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
         border: 1px solid #DDDDDD;
         position: fixed;
         top: 100px;
@@ -974,6 +982,8 @@
     {
         float: right;
         -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
         background-color: #F6F6F6;
         border: 1px solid #DDDDDD;
         margin: 0 20px 10px 10px;
@@ -1068,6 +1078,8 @@
     .relpage
     {
         -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
         border: 1px solid #DDDDDD;
         padding: 25px 25px;
         clear: both;
@@ -1084,6 +1096,8 @@
     h3.fn, span.fn
     {
 		-moz-border-radius:7px 7px 7px 7px;
+		-webkit-border-radius:7px 7px 7px 7px;
+		border-radius:7px 7px 7px 7px;
         background-color: #F6F6F6;
         border-width: 1px;
         border-style: solid;
@@ -1102,6 +1116,8 @@
     border-style: solid;
     border-color: #E6E6E6;
     -moz-border-radius: 7px 7px 7px 7px;
+    -webkit-border-radius: 7px 7px 7px 7px;
+    border-radius: 7px 7px 7px 7px;
 	width:100%;
 	}
 	
-- 
cgit v0.12


From bfc32c590d797599ddfb814f023e5837c663ec23 Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Date: Tue, 10 Aug 2010 13:09:46 +0200
Subject: Mac: Fix crash when using style to draw on other things than widgets

When drawing a complex control using the style, you are allowd to
skip giving a widget as the last argument. But when doing so, it
caused a crash in the mac style.

Reviewed-by: Fabien Freling
---
 src/gui/styles/qmacstyle_mac.mm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index ae90d26..671a888 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -1440,6 +1440,9 @@ QMacStylePrivate::QMacStylePrivate(QMacStyle *style)
 
 bool QMacStylePrivate::animatable(QMacStylePrivate::Animates as, const QWidget *w) const
 {
+    if (!w)
+        return false;
+
     if (as == AquaPushButton) {
         QPushButton *pb = const_cast<QPushButton *>(static_cast<const QPushButton *>(w));
         if (w->window()->isActiveWindow() && pb && !mouseDown) {
-- 
cgit v0.12