Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Adapt the TapAndHold recognizer to non-touch too
  add setNativeArguments() and nativeArguments()
  fix bogus return value from qprocess::execute()
  qdoc: Simplified code to enable fixing of QTBUG-6340.
  Doc: fixing img style

2 files changed, 17 insertions, 18 deletions

diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index 28d4ed4..2fd6fa8 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -423,22 +423,14 @@ signals with the \l {Connections} element.
 
 Additionally, if a property is added to a C++ class, all QML elements
 based on that C++ class will have a \e{value-changed} signal handler
-for that property. The name of the signal handler is \e{on<Property
-name>Changed}, with the first letter of the property name being upper
-cased. 
-
-\note If the NOTIFY signal for the added property is not simply
-\c{<property_name>Changed()}, then you will get two equivalent signal
-handlers, one because of the signal, one because of the property. For
-example, if the property \c{test_property} with NOTIFY signal
-\c{testPropChanged()} is added to a C++ class, then QML elements based
-on that C++ class will have two signal handlers:
-\c{onTest_propertyChanged} because of the property, and
-\c{onTestPropChanged} because of the NOTIFY signal. For clarity, we
-suggest that for properties exposed to QML in this way, the name of
-the NOTIFY signal should be just \c{<property_name>Changed()}, so that
-there will be just one signal handler in QML and one naming
-convention used.  
+for that property. The name of the signal handler is
+\e{on<Property-name>Changed}, with the first letter of the property
+name being upper case.
+
+\note The QML signal handler will always be named
+on<Property-name>Changed, regardless of the name used for the NOTIFY
+signal in C++. We recommend using <property-name>Changed() for the
+NOTIFY signal in C++.
 
 See also \l {Extending types from QML}.
 
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 299806b..184a832 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -18,6 +18,8 @@
     fieldset, img
     {
         border: 0;
+		height:100%;
+		width:100%
     }
     address, caption, cite, code, dfn, em, strong, th, var, optgroup
     {
@@ -756,6 +758,7 @@
     pre
     {
         border: 1px solid #DDDDDD;
+		-moz-border-radius: 7px 7px 7px 7px;
         margin: 0 20px 10px 10px;
         padding: 20px 15px 20px 20px;
         overflow-x: auto;
@@ -1023,6 +1026,7 @@
     }
     h3.fn, span.fn
     {
+		-moz-border-radius:7px 7px 7px 7px;
         background-color: #F6F6F6;
         border-width: 1px;
         border-style: solid;
@@ -1040,6 +1044,7 @@
     border-width: 1px;
     border-style: solid;
     border-color: #E6E6E6;
+    -moz-border-radius: 7px 7px 7px 7px;
 	width:100%;
 	}
 	
@@ -1199,6 +1204,7 @@ vertical-align:top;
 width:100%;
 background-color:#F6F6F6;
 border:1px solid #E6E6E6;
+-moz-border-radius: 7px 7px 7px 7px;
 font-size:12pt;
 padding-left:10px;
 margin-top:10px;
@@ -1250,8 +1256,9 @@ pre.highlightedCode {
 	}
 	.navTop{ 
 	float:right;
-	padding-right:5px;
-	margin-top:15px;
+	display:block;
+	padding-right:15px;
+	/*margin-top:10px;*/
 	}
 	
 	.wrap .content .toc h3{