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

Change-Id: Ibc00a0629361eb26d2ad3b47e64620a2ad03717b

Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ibc00a0629361eb26d2ad3b47e64620a2ad03717b
82c37e5a · Frederik Gladhorn · b18076a1 · 2d3774e8 · 82c37e5a · 82c37e5a
Commit 82c37e5a authored 11 years ago by Frederik Gladhorn
--- a/src/xmlpatterns/doc/src/xquery-introduction.qdoc
+++ b/src/xmlpatterns/doc/src/xquery-introduction.qdoc
@@ -743,7 +743,7 @@ You can also ask questions on XQuery mail lists:
 \list
 \li
-\l{http://qt.nokia.com/lists/qt-interest/}{qt-interest}
+\l{http://lists.qt-project.org/mailman/listinfo/interest}{qt-interest}
 \li
 \l{http://www.x-query.com/mailman/listinfo/talk}{talk at x-query.com}.
 \endlist

--- a/tests/auto/bic/data/QtXmlPatterns.5.0.0.linux-gcc-ia32.txt
+++ b/tests/auto/bic/data/QtXmlPatterns.5.0.0.linux-gcc-ia32.txt
--- a/tests/auto/bic/data/QtXmlPatterns.5.1.0.linux-gcc-ia32.txt
+++ b/tests/auto/bic/data/QtXmlPatterns.5.1.0.linux-gcc-ia32.txt