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

 Conflicts:
	src/widgets/styles/qstylesheetstyle.cpp

Change-Id: I3a503b44ae413fbc0a90f4af70b8f84daffd86ad

1 files changed, 4 insertions, 1 deletions

diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp
index 28c66628b7..b5d8320bce 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp
@@ -353,7 +353,10 @@ while (i.hasNext()) {
 {
 //! [31]
 QString wildcard = QRegularExpression::wildcardToRegularExpression("*.jpeg");
-// wilcard == ".*\.jpeg"
+// Will match files with names like:
+//    foo.jpeg
+//    f_o_o.jpeg
+//    föö.jpeg
 //! [31]
 }