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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits)
  Doc: Fixed an off-by-one error in an example.
  Fix QT_NO_TEXTHTMLPARSER
  Fix QT_NO_DOM
  Fix QT_NO_TEXTSTREAM compilation errors.
  Fix QT_NO_VALIDATOR compilation.
  Doc: Removed a misleading sentence about a class constructor.
  Doc: correcting docs in QDrag::exec
  Doc: Adding note about  QDrag::exec()
  Revert behavior of QTextLayout::boundingRect() when line width is set
  Fix unreasonably large width of QTextLayout::boundingRect()
  Doc: replacing old image
  Fix compilation with stricts compilers.
  Fix QT_NO_DIRMODEL build error in QtDeclarative.
  Revert "Added native key support to QSharedMemory API."
  Revert "Improved documentation for QSharedMemory's key/setKey functions."
  Fix a simple mistake in QXmlStreamReader::atEnd() docs.
  Improved documentation for QSharedMemory's key/setKey functions.
  Added native key support to QSharedMemory API.
  Make test work with shadow builds again.
  Doc: Corrected the documentation about the compression threshold.
  ...

2 files changed, 23 insertions, 23 deletions

diff --git a/doc/src/development/rcc.qdoc b/doc/src/development/rcc.qdoc
index 1541e11..999408b 100644
--- a/doc/src/development/rcc.qdoc
+++ b/doc/src/development/rcc.qdoc
@@ -60,28 +60,30 @@
     \row \o \c{-o} \o \c{file} \o Write output to \c{file} rather than to stdout.
 
     \row \o \c{-name} \o \c{name} \o Create an external initialization 
-    	    	      	 	     function with \c{name}.
-
-    \row \o \c{-threshold} \o \c{level} \o Specifies a threshold \c{level} (in 
-    	    		      		   bytes) to use when deciding whether
-					   to compress a file. If the file is 
-					   smaller than the threshold \c{level}, 
-					   it is not compressed. The default
-					   threshold level is 70 bytes.
-                                             
+                                     function with \c{name}.
+
+    \row \o \c{-threshold} \o \c{level} \o Specifies a threshold \c{level} (as a
+                           percentage) to use when deciding whether to compress
+                           a file. If the reduction in the file size is greater than
+                           the threshold \c{level}, it is compressed; otherwise,
+                           the uncompressed data is stored instead. The default
+                           threshold level is 70%, meaning that compressed files
+                           which are 30% or less of their original size are
+                           stored as compressed data.
+
     \row \o \c{-compress} \o \c{level} \o Compress input files to the given
-                                          compression \c{level}, which is an 
-					  integer in the range 1 to 9. Level 1 
-					  does the least compression but is 
-					  fastest. Level 9 does the most 
-					  compression but is slowest. To turn 
-					  off compression, use \c{-no-compress}. 
-					  The default value for \c{level} is -1,
-					  which means use zlib's default 
-					  compression level. 
+                                          compression \c{level}, which is an
+                                          integer in the range 1 to 9. Level 1
+                                          does the least compression but is
+                                          fastest. Level 9 does the most
+                                          compression but is slowest. To turn
+                                          off compression, use \c{-no-compress}.
+                                          The default value for \c{level} is -1,
+                                          which means use zlib's default
+                                          compression level.
 
     \row \o \c{-root} \o \c{path} \o Prefix the resource access path with \c{path}.
-    	    	      	 	     The default is no prefix.
+                                     The default is no prefix.
 
     \row \o \c{-no-compress} \o \o Disable compression.
 
diff --git a/doc/src/examples/pixelator.qdoc b/doc/src/examples/pixelator.qdoc
index 09ae3e8..95099e1 100644
--- a/doc/src/examples/pixelator.qdoc
+++ b/doc/src/examples/pixelator.qdoc
@@ -80,8 +80,6 @@
     functions to indicate the dimensions of the image and supply data to other
     components.
 
-    For convenience, the image to be used is passed in the constructor.
-
     \section1 ImageModel Class Implementation
 
     The constructor is trivial:
@@ -89,7 +87,7 @@
     \snippet examples/itemviews/pixelator/imagemodel.cpp 0
 
     The \c setImage() function sets the image that will be used by the model:
-   
+
     \snippet examples/itemviews/pixelator/imagemodel.cpp 1
 
     The QAbstractItemModel::reset() call tells the view(s) that the model
@@ -233,7 +231,7 @@
     This enables the items to be drawn without any gaps between them. Removing
     the headers also prevents the user from adjusting the sizes of individual
     rows and columns. 
-    
+
     We also set the minimum section size to 1 on the headers. If we
     didn't, the headers would default to a larger size, preventing
     us from displaying really small items (which can be specified