Merge remote-tracking branch 'origin/stable' into dev

For the conflicts in msvc_nmake.cpp the ifdefs are extended since we
need to support windows phone in the target branch while it is not there
in the current stable branch (as of Qt 5.2).

Conflicts:
	configure
	qmake/generators/win32/msvc_nmake.cpp
	src/3rdparty/angle/src/libEGL/Surface.cpp
	src/angle/src/common/common.pri
	src/corelib/global/qglobal.h
	src/corelib/io/qstandardpaths.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxscreeneventhandler.h
	src/plugins/platforms/xcb/qglxintegration.h
	src/widgets/kernel/win.pri
	tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
	tools/configure/configureapp.cpp

Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812

1 files changed, 117 insertions, 117 deletions

diff --git a/src/tools/qdoc/doc/qdoc-manual-cmdindex.qdoc b/src/tools/qdoc/doc/qdoc-manual-cmdindex.qdoc
index 97d9151e40..a713b2738d 100644
--- a/src/tools/qdoc/doc/qdoc-manual-cmdindex.qdoc
+++ b/src/tools/qdoc/doc/qdoc-manual-cmdindex.qdoc
@@ -37,123 +37,123 @@
 
     \list
 
-    \li \l {04-qdoc-commands-textmarkup.html#a-command} {\\a}
-    \li \l {11-qdoc-commands-specialcontent.html#abstract-command} {\\abstract}
-    \li \l {12-0-qdoc-commands-miscellaneous.html#annotatedlist-command} {\\annotatedlist}
-    \li \l {04-qdoc-commands-textmarkup.html#b-command} {\\b} \span {class="newStuff"} {(new 5/3/2012)}
-    \li \l {04-qdoc-commands-textmarkup.html#b-command} {\\bold} \span {class="newStuff"} {(deprecated, use \\b)}
-    \li \l {11-qdoc-commands-specialcontent.html#brief-command} {\\brief}
-    \li \l {04-qdoc-commands-textmarkup.html#c-command} {\\c}
-    \li \l {09-qdoc-commands-includingimages.html#caption-command} {\\caption}
-    \li \l {05-qdoc-commands-documentstructure.html#chapter-command} {\\chapter}
-    \li \l {13-qdoc-commands-topics.html#class-command} {\\class}
-    \li \l {06-qdoc-commands-includecodeinline.html#code-command} {\\code}
-    \li \l {07-0-qdoc-commands-includingexternalcode.html#codeline-command} {\\codeline},
-    \li \l {16-qdoc-commands-status.html#compat-command} {\\compat}
-    \li \l {15-qdoc-commands-navigation.html#contentspage-command} {\\contentspage}
-    \li \l {16-qdoc-commands-status.html#default-command} {\\default}
-    \li \l {21-0-qdoc-creating-dita-maps.html#ditamap-command} {\\ditamap} \span {class="newStuff"} {(new 05/03/12)}
-    \li \l {04-qdoc-commands-textmarkup.html#div-command} {\\div}
-    \li \l {07-0-qdoc-commands-includingexternalcode.html#dots-command} {\\dots}
-    \li \l {04-qdoc-commands-textmarkup.html#e-command} {\\e} \span {class="newStuff"} {(new 5/3/2012)}
-    \li \l {12-0-qdoc-commands-miscellaneous.html#else-command} {\\else}
-    \li \l {12-0-qdoc-commands-miscellaneous.html#endif-command} {\\endif}
-    \li \l {13-qdoc-commands-topics.html#enum-command} {\\enum}
-    \li \l {13-qdoc-commands-topics.html#example-command} {\\example}
-    \li \l {13-qdoc-commands-topics.html#externalpage-command} {\\externalpage}
-    \li \l {13-qdoc-commands-topics.html#fn-command} {\\fn}
-    \li \l {11-qdoc-commands-specialcontent.html#footnote-command} {\\footnote}
-    \li \l {12-0-qdoc-commands-miscellaneous.html#generatelist-command} {\\generatelist}
-    \li \l {13-qdoc-commands-topics.html#group-command} {\\group}
-    \li \l {10-qdoc-commands-tablesandlists.html#header-command} {\\header}
-    \li \l {13-qdoc-commands-topics.html#headerfile-command} {\\headerfile}
-    \li \l {04-qdoc-commands-textmarkup.html#e-command} {\\i} \span {class="newStuff"} {(deprecated, use \\e)}
-    \li \l {12-0-qdoc-commands-miscellaneous.html#if-command} {\\if}
-    \li \l {09-qdoc-commands-includingimages.html#image-command} {\\image}
-    \li \l {12-0-qdoc-commands-miscellaneous.html#include-command} {\\include}
-    \li \l {15-qdoc-commands-navigation.html#indexpage-command} {\\indexpage}
-    \li \l {19-qdoc-commands-grouping.html#ingroup-command} {\\ingroup}
-    \li \l {18-qdoc-commands-relating.html#inherits-command}{\\inherits}
-    \li \l {09-qdoc-commands-includingimages.html#inlineimage-command} {\\inlineimage}
-    \li \l {19-qdoc-commands-grouping.html#inmodule-command} {\\inmodule}
-    \li \l {13-qdoc-commands-topics.html#inqmlmodule-command} {\\inqmlmodule}
-    \li \l {13-qdoc-commands-topics.html#instantiates-command} {\\instantiates} \span {class="newStuff"} {(new 27/7/2012)}
-    \li \l {16-qdoc-commands-status.html#internal-command} {\\internal}
-    \li \l {08-qdoc-commands-creatinglinks.html#keyword-command} {\\keyword}
-    \li \l {08-qdoc-commands-creatinglinks.html#l-command} {\\l}
-    \li \l {11-qdoc-commands-specialcontent.html#legalese-command} {\\legalese}
-    \li \l {10-qdoc-commands-tablesandlists.html#li-command} {\\li} \span {class="newStuff"} {(new 5/3/2012)}
-    \li \l {10-qdoc-commands-tablesandlists.html#list-command} {\\list}
-    \li \l {13-qdoc-commands-topics.html#macro-command} {\\macro}
-    \li \l {19-qdoc-commands-grouping.html#mainclass-command} {\\mainclass}
-    \li \l {21-0-qdoc-creating-dita-maps.html#mapref-command} {\\mapref} \span {class="newStuff"} {(new 05/03/12)}
-    \li \l {12-0-qdoc-commands-miscellaneous.html#meta-command} {\\meta}
-    \li \l {13-qdoc-commands-topics.html#module-command} {\\module}
-    \li \l {13-qdoc-commands-topics.html#namespace-command} {\\namespace}
-    \li \l {15-qdoc-commands-navigation.html#nextpage-command} {\\nextpage}
-    \li \l {06-qdoc-commands-includecodeinline.html#newcode-command} {\\newcode}
-    \li \l {17-qdoc-commands-thread.html#nonreentrant-command} {\\nonreentrant}
-    \li \l {11-qdoc-commands-specialcontent.html#note-command} {\\note}
-    \li \l {10-qdoc-commands-tablesandlists.html#li-command} {\\o} \span {class="newStuff"} {(deprecated, use \\li)}
+    \li \l {a-command} {\\a}
+    \li \l {abstract-command} {\\abstract}
+    \li \l {annotatedlist-command} {\\annotatedlist}
+    \li \l {b-command} {\\b} \span {class="newStuff"}
+    \li \l {b-command} {\\bold} \span {class="newStuff"} {(deprecated, use \\b)}
+    \li \l {brief-command} {\\brief}
+    \li \l {c-command} {\\c}
+    \li \l {caption-command} {\\caption}
+    \li \l {chapter-command} {\\chapter}
+    \li \l {class-command} {\\class}
+    \li \l {code-command} {\\code}
+    \li \l {codeline-command} {\\codeline},
+    \li \l {compat-command} {\\compat}
+    \li \l {contentspage-command} {\\contentspage}
+    \li \l {default-command} {\\default}
+    \li \l {ditamap-command} {\\ditamap} \span {class="newStuff"}
+    \li \l {div-command} {\\div}
+    \li \l {dots-command} {\\dots}
+    \li \l {e-command} {\\e} \span {class="newStuff"}
+    \li \l {else-command} {\\else}
+    \li \l {endif-command} {\\endif}
+    \li \l {enum-command} {\\enum}
+    \li \l {example-command} {\\example}
+    \li \l {externalpage-command} {\\externalpage}
+    \li \l {fn-command} {\\fn}
+    \li \l {footnote-command} {\\footnote}
+    \li \l {generatelist-command} {\\generatelist}
+    \li \l {group-command} {\\group}
+    \li \l {header-command} {\\header}
+    \li \l {headerfile-command} {\\headerfile}
+    \li \l {e-command} {\\i} \span {class="newStuff"} {(deprecated, use \\e)}
+    \li \l {if-command} {\\if}
+    \li \l {image-command} {\\image}
+    \li \l {include-command} {\\include}
+    \li \l {indexpage-command} {\\indexpage}
+    \li \l {ingroup-command} {\\ingroup}
+    \li \l {inherits-command}{\\inherits}
+    \li \l {inlineimage-command} {\\inlineimage}
+    \li \l {inmodule-command} {\\inmodule}
+    \li \l {inqmlmodule-command} {\\inqmlmodule}
+    \li \l {instantiates-command} {\\instantiates} \span {class="newStuff"} {(new 27/7/2012)}
+    \li \l {internal-command} {\\internal}
+    \li \l {keyword-command} {\\keyword}
+    \li \l {l-command} {\\l}
+    \li \l {legalese-command} {\\legalese}
+    \li \l {li-command} {\\li} \span {class="newStuff"}
+    \li \l {list-command} {\\list}
+    \li \l {macro-command} {\\macro}
+    \li \l {mainclass-command} {\\mainclass}
+    \li \l {mapref-command} {\\mapref} \span {class="newStuff"}
+    \li \l {meta-command} {\\meta}
+    \li \l {module-command} {\\module}
+    \li \l {namespace-command} {\\namespace}
+    \li \l {nextpage-command} {\\nextpage}
+    \li \l {newcode-command} {\\newcode}
+    \li \l {nonreentrant-command} {\\nonreentrant}
+    \li \l {note-command} {\\note}
+    \li \l {li-command} {\\o} \span {class="newStuff"} {(deprecated, use \\li)}
 
-    \li \l {16-qdoc-commands-status.html#obsolete-command} {\\obsolete}
-    \li \l {06-qdoc-commands-includecodeinline.html#oldcode-command} {\\oldcode}
-    \li \l {12-0-qdoc-commands-miscellaneous.html#omit-command} {\\omit}
-    \li \l {10-qdoc-commands-tablesandlists.html#omitvalue-command} {\\omitvalue}
-    \li \l {18-qdoc-commands-relating.html#overload-command} {\\overload}
-    \li \l {13-qdoc-commands-topics.html#page-command} {\\page}
-    \li \l {05-qdoc-commands-documentstructure.html#part-command} {\\part}
-    \li \l {16-qdoc-commands-status.html#preliminary-command} {\\preliminary}
-    \li \l {15-qdoc-commands-navigation.html#previouspage-command} {\\previouspage}
-    \li \l {07-0-qdoc-commands-includingexternalcode.html#printline-command} {\\printline}
-    \li \l {07-0-qdoc-commands-includingexternalcode.html#printto-command} {\\printto}
-    \li \l {07-0-qdoc-commands-includingexternalcode.html#printuntil-command} {\\printuntil}
-    \li \l {13-qdoc-commands-topics.html#property-command} {\\property}
-    \li \l {13-qdoc-commands-topics.html#qmlattachedproperty-command} {\\qmlattachedproperty}
-    \li \l {13-qdoc-commands-topics.html#qmlattachedsignal-command} {\\qmlattachedsignal}
-    \li \l {13-qdoc-commands-topics.html#qmlbasictype-command} {\\qmlbasictype}
-    \li \l {13-qdoc-commands-topics.html#qmlclass-command} {\\qmlclass} \span {class="newStuff"} {(deprecated, use \\qmltype)}
-    \li \l {13-qdoc-commands-topics.html#qmltype-command} {\\qmltype}  \span {class="newStuff"} {(new 27/7/2012)}
-    \li \l {13-qdoc-commands-topics.html#qmlmethod-command} {\\qmlmethod}
-    \li \l {13-qdoc-commands-topics.html#qmlproperty-command} {\\qmlproperty}
-    \li \l {13-qdoc-commands-topics.html#qmlsignal-command} {\\qmlsignal}
-    \li \l {13-qdoc-commands-topics.html#qmlmodule-command} {\\qmlmodule}
-    \li \l {11-qdoc-commands-specialcontent.html#quotation-command} {\\quotation}
-    \li \l {07-0-qdoc-commands-includingexternalcode.html#quotefile-command} {\\quotefile}
-    \li \l {07-0-qdoc-commands-includingexternalcode.html#quotefromfile-command} {\\quotefromfile}
-    \li \l {12-0-qdoc-commands-miscellaneous.html#raw-command} {\\raw} \span {class="newStuff"} {(avoid)}
-    \li \l {17-qdoc-commands-thread.html#reentrant-command} {\\reentrant}
-    \li \l {18-qdoc-commands-relating.html#reimp-command} {\\reimp}
-    \li \l {18-qdoc-commands-relating.html#relates-command} {\\relates}
-    \li \l {10-qdoc-commands-tablesandlists.html#row-command} {\\row}
-    \li \l {08-qdoc-commands-creatinglinks.html#sa-command} {\\sa}
-    \li \l {05-qdoc-commands-documentstructure.html#sectionOne-command} {\\section1}
-    \li \l {05-qdoc-commands-documentstructure.html#sectionTwo-command} {\\section2}
-    \li \l {05-qdoc-commands-documentstructure.html#sectionThree-command} {\\section3}
-    \li \l {05-qdoc-commands-documentstructure.html#sectionFour-command} {\\section4}
-    \li \l {13-qdoc-commands-topics.html#service-command} {\\service}
-    \li \l {16-qdoc-commands-status.html#since-command} {\\since}
-    \li \l {07-0-qdoc-commands-includingexternalcode.html#skipline-command} {\\skipline}
-    \li \l {07-0-qdoc-commands-includingexternalcode.html#skipto-command} {\\skipto}
-    \li \l {07-0-qdoc-commands-includingexternalcode.html#skipuntil-command} {\\skipuntil}
-    \li \l {07-0-qdoc-commands-includingexternalcode.html#snippet-command} {\\snippet},
-    \li \l {04-qdoc-commands-textmarkup.html#span-command} {\\span}
-    \li \l {15-qdoc-commands-navigation.html#startpage-command} {\\startpage}
-    \li \l {04-qdoc-commands-textmarkup.html#sub-command} {\\sub}
-    \li \l {20-qdoc-commands-namingthings.html#subtitle-command} {\\subtitle}
-    \li \l {04-qdoc-commands-textmarkup.html#sup-command} {\\sup}
-    \li \l {10-qdoc-commands-tablesandlists.html#table-command} {\\table}
-    \li \l {11-qdoc-commands-specialcontent.html#tableofcontents-command} {\\tableofcontents}
-    \li \l {08-qdoc-commands-creatinglinks.html#target-command} {\\target}
-    \li \l {17-qdoc-commands-thread.html#threadsafe-command} {\\threadsafe}
-    \li \l {20-qdoc-commands-namingthings.html#title-command} {\\title}
-    \li \l {21-0-qdoc-creating-dita-maps.html#topicref-command} {\\topicref} \span {class="newStuff"} {(new 05/03/12)}
-    \li \l {04-qdoc-commands-textmarkup.html#tt-command} {\\tt}
-    \li \l {13-qdoc-commands-topics.html#typedef-command} {\\typedef}
-    \li \l {04-qdoc-commands-textmarkup.html#uicontrol-command} {\\uicontrol} {(new 25/3/2012)}
-    \li \l {04-qdoc-commands-textmarkup.html#underline-command} {\\underline}
-    \li \l {13-qdoc-commands-topics.html#variable-command} {\\variable}
-    \li \l {10-qdoc-commands-tablesandlists.html#value-command} {\\value}
-    \li \l {11-qdoc-commands-specialcontent.html#warning-command} {\\warning}
+    \li \l {obsolete-command} {\\obsolete}
+    \li \l {oldcode-command} {\\oldcode}
+    \li \l {omit-command} {\\omit}
+    \li \l {omitvalue-command} {\\omitvalue}
+    \li \l {overload-command} {\\overload}
+    \li \l {page-command} {\\page}
+    \li \l {part-command} {\\part}
+    \li \l {preliminary-command} {\\preliminary}
+    \li \l {previouspage-command} {\\previouspage}
+    \li \l {printline-command} {\\printline}
+    \li \l {printto-command} {\\printto}
+    \li \l {printuntil-command} {\\printuntil}
+    \li \l {property-command} {\\property}
+    \li \l {qmlattachedproperty-command} {\\qmlattachedproperty}
+    \li \l {qmlattachedsignal-command} {\\qmlattachedsignal}
+    \li \l {qmlbasictype-command} {\\qmlbasictype}
+    \li \l {qmlclass-command} {\\qmlclass} \span {class="newStuff"} {(deprecated, use \\qmltype)}
+    \li \l {qmltype-command} {\\qmltype}  \span {class="newStuff"}
+    \li \l {qmlmethod-command} {\\qmlmethod}
+    \li \l {qmlproperty-command} {\\qmlproperty}
+    \li \l {qmlsignal-command} {\\qmlsignal}
+    \li \l {qmlmodule-command} {\\qmlmodule}
+    \li \l {quotation-command} {\\quotation}
+    \li \l {quotefile-command} {\\quotefile}
+    \li \l {quotefromfile-command} {\\quotefromfile}
+    \li \l {raw-command} {\\raw} \span {class="newStuff"} {(avoid)}
+    \li \l {reentrant-command} {\\reentrant}
+    \li \l {reimp-command} {\\reimp}
+    \li \l {relates-command} {\\relates}
+    \li \l {row-command} {\\row}
+    \li \l {sa-command} {\\sa}
+    \li \l {sectionOne-command} {\\section1}
+    \li \l {sectionTwo-command} {\\section2}
+    \li \l {sectionThree-command} {\\section3}
+    \li \l {sectionFour-command} {\\section4}
+    \li \l {service-command} {\\service}
+    \li \l {since-command} {\\since}
+    \li \l {skipline-command} {\\skipline}
+    \li \l {skipto-command} {\\skipto}
+    \li \l {skipuntil-command} {\\skipuntil}
+    \li \l {snippet-command} {\\snippet},
+    \li \l {span-command} {\\span}
+    \li \l {startpage-command} {\\startpage}
+    \li \l {sub-command} {\\sub}
+    \li \l {subtitle-command} {\\subtitle}
+    \li \l {sup-command} {\\sup}
+    \li \l {table-command} {\\table}
+    \li \l {tableofcontents-command} {\\tableofcontents}
+    \li \l {target-command} {\\target}
+    \li \l {threadsafe-command} {\\threadsafe}
+    \li \l {title-command} {\\title}
+    \li \l {topicref-command} {\\topicref} \span {class="newStuff"}
+    \li \l {tt-command} {\\tt}
+    \li \l {typedef-command} {\\typedef}
+    \li \l {uicontrol-command} {\\uicontrol}
+    \li \l {underline-command} {\\underline}
+    \li \l {variable-command} {\\variable}
+    \li \l {value-command} {\\value}
+    \li \l {warning-command} {\\warning}
     \endlist
 */