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

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  qdoc3: Fix compilation with -no-stl
  don't add extraneous empty command lines
  make the $$quote() function less prominent
  minor cleanup of the QMAKE_POST_LINK command line construction
  silence qmake warning about unbalanced parentheses

2 files changed, 9 insertions, 19 deletions

diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index 373254c..f2ca21e 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -247,8 +247,7 @@
 
     Normally, variables are used to contain whitespace-separated lists
     of values. However, it is sometimes necessary to specify values containing
-    spaces. These must be quoted by using the
-    \l{qmake Function Reference#quote-string}{quote()} function in the following way:
+    spaces. These must be quoted by using double quotes:
 
     \snippet doc/src/snippets/qmake/quoting.pro 0
 
@@ -256,9 +255,7 @@
     the variable. A similar approach is used to deal with paths that contain
     spaces, particularly when defining the
     \l{qmake Variable Reference#INCLUDEPATH}{INCLUDEPATH} and
-    \l{qmake Variable Reference#LIBS}{LIBS} variables for the Windows platform.
-    In cases like these, the \l{qmake Function Reference#quote(string)}{quote()}
-    function can be used in the following way:
+    \l{qmake Variable Reference#LIBS}{LIBS} variables for the Windows platform:
 
     \snippet doc/src/snippets/qmake/spaces.pro quoting include paths with spaces
 
@@ -1659,9 +1656,7 @@
 
     To specify a path containing spaces, quote the path using the technique
     mentioned in the \l{qmake Project Files#Whitespace}{qmake Project Files}
-    document. For example, paths with spaces can be specified on Windows
-    and Unix platforms by using the \l{qmake Function Reference#quote-string}{quote()}
-    function in the following way:
+    document.
 
     \snippet doc/src/snippets/qmake/spaces.pro quoting include paths with spaces
 
@@ -1723,9 +1718,7 @@
 
     To specify a path containing spaces, quote the path using the technique
     mentioned in the \l{qmake Project Files#Whitespace}{qmake Project Files}
-    document. For example, paths with spaces can be specified on Windows
-    and Unix platforms by using the \l{qmake Function Reference#quote-string}{quote()}
-    function in the following way:
+    document.
 
     \snippet doc/src/snippets/qmake/spaces.pro quoting library paths with spaces
 
@@ -3614,10 +3607,7 @@
     \section1 quote(string)
 
     Converts a whole \e string into a single entity and returns the result.
-    Newlines, carriage returns, and tabs can be specified in the string
-    with \\n \\r and \\t. The return value does not contain either single
-    or double quotation marks unless you explicitly include them yourself,
-    but will be placed into a single entry (for literal expansion).
+    This is just a fancy way of enclosing the string into double quotes.
 
     \section1 replace(string, old_string, new_string)
 
diff --git a/doc/src/snippets/qmake/spaces.pro b/doc/src/snippets/qmake/spaces.pro
index 544ef05..614d4c5 100644
--- a/doc/src/snippets/qmake/spaces.pro
+++ b/doc/src/snippets/qmake/spaces.pro
@@ -1,9 +1,9 @@
 #! [quoting library paths with spaces]
-win32:LIBS += $$quote(C:/mylibs/extra libs/extra.lib)
-unix:LIBS += $$quote(-L/home/user/extra libs) -lextra
+win32:LIBS += "C:/mylibs/extra libs/extra.lib"
+unix:LIBS += "-L/home/user/extra libs" -lextra
 #! [quoting library paths with spaces]
 
 #! [quoting include paths with spaces]
-win32:INCLUDEPATH += $$quote(C:/mylibs/extra headers)
-unix:INCLUDEPATH += $$quote(/home/user/extra headers)
+win32:INCLUDEPATH += "C:/mylibs/extra headers"
+unix:INCLUDEPATH += "/home/user/extra headers"
 #! [quoting include paths with spaces]