Merge remote-tracking branch 'origin/5.10' into 5.11

Change-Id: Ic4b4cabff030fe494e2f446d99127847c6ba421a

5 files changed, 51 insertions, 90 deletions

diff --git a/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc b/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc
index 1df5218..0882017 100644
--- a/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc
+++ b/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -65,54 +65,17 @@
     \li \l{Qt XML Patterns C++ Classes}{C++ Classes}
     \endlist
 
-    \section1 License Information
+    \section1 Licenses and Attributions
 
-    The XML Schema implementation provided by this module contains the \c xml.xsd file
-    (located in \c{src/xmlpatterns/schema/schemas}) which is licensed under the terms
-    given below. This module is always built with XML Schema support enabled.
-
-    \legalese
-    W3C\copyright SOFTWARE NOTICE AND LICENSE
-
-    This license came from: http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-    This work (and included software, documentation such as READMEs, or other
-    related items) is being provided by the copyright holders under the following
-    license. By obtaining, using and/or copying this work, you (the licensee)
-    agree that you have read, understood, and will comply with the following
-    terms and conditions.
-
-    Permission to copy, modify, and distribute this software and its
-    documentation, with or without modification, for any purpose and without
-    fee or royalty is hereby granted, provided that you include the following on
-    ALL copies of the software and documentation or portions thereof, including
-    modifications:
-
-      1. The full text of this NOTICE in a location viewable to users of the
-         redistributed or derivative work.\br
-      2. Any pre-existing intellectual property disclaimers, notices, or terms
-         and conditions. If none exist, the W3C Software Short Notice should be
-         included (hypertext is preferred, text is permitted)
-         within the body of any redistributed or derivative code.\br
-      3. Notice of any changes or modifications to the files, including the date
-         changes were made. (We recommend you provide URIs to the location from
-         which the code is derived.)
-
-    THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
-    MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-    LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
-    PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
-    ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-    COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
-    CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
-    DOCUMENTATION.
-
-    The name and trademarks of copyright holders may NOT be used in
-    advertising or publicity pertaining to the software without specific, written
-    prior permission. Title to copyright in this software and any associated
-    documentation will at all times remain with copyright holders.
-    \endlegalese
+    The Qt XML Patterns module is available under commercial licenses from \l{The Qt Company}.
+    In addition, it is available under free software licenses. Since Qt 5.4,
+    these free software licenses are
+    \l{GNU Lesser General Public License, version 3}, or
+    the \l{GNU General Public License, version 2}.
+    See \l{Qt Licensing} for further details.
 
+    Furthermore, Qt XML Patterns in Qt \QtVersion contain third party
+    modules under following permissive licenses:
 
+    \generatelist{groupsbymodule attributions-qtxmlpatterns}
 */
diff --git a/src/xmlpatterns/expr/qevaluationcache_p.h b/src/xmlpatterns/expr/qevaluationcache_p.h
index 6c2efc7..d3ac422 100644
--- a/src/xmlpatterns/expr/qevaluationcache_p.h
+++ b/src/xmlpatterns/expr/qevaluationcache_p.h
@@ -120,7 +120,7 @@ namespace QPatternist
 
     private:
         static DynamicContext::Ptr topFocusContext(const DynamicContext::Ptr &context);
-        const VariableDeclaration*  m_declaration;
+        const VariableDeclaration::Ptr m_declaration;
         /**
          * This variable must not be called m_slot. If it so, a compiler bug on
          * HP-UX-aCC-64 is triggered in the constructor initializor. See the
diff --git a/src/xmlpatterns/expr/qevaluationcache_tpl_p.h b/src/xmlpatterns/expr/qevaluationcache_tpl_p.h
index 26f53b5..b8e09a9 100644
--- a/src/xmlpatterns/expr/qevaluationcache_tpl_p.h
+++ b/src/xmlpatterns/expr/qevaluationcache_tpl_p.h
@@ -58,7 +58,7 @@ template<bool IsForGlobal>
 EvaluationCache<IsForGlobal>::EvaluationCache(const Expression::Ptr &op,
                                               const VariableDeclaration::Ptr &varDecl,
                                               const VariableSlotID aSlot) : SingleContainer(op)
-                                                                          , m_declaration(varDecl.constData())
+                                                                          , m_declaration(varDecl)
                                                                           , m_varSlot(aSlot)
 {
     Q_ASSERT(m_declaration);
diff --git a/src/xmlpatterns/schema/schemas/qt_attribution.json b/src/xmlpatterns/schema/schemas/qt_attribution.json
new file mode 100644
index 0000000..ad3a14d
--- /dev/null
+++ b/src/xmlpatterns/schema/schemas/qt_attribution.json
@@ -0,0 +1,17 @@
+{
+    "Id": "xml-xsd",
+    "Name": "XML Schema",
+    "QDocModule": "qtxmlpatterns",
+    "QtUsage": "Used for implementing validation of the the XML schema.",
+
+    "Files": "xml.xsd",
+    "Description": "The xml.xsd file provided by W3C describes the XML
+    namespace, in a form suitable for import by other schema documents.",
+    "Homepage": "https://www.w3.org/2001/xml.xsd",
+    "Version": "2007/08",
+    "DownloadLocation": "http://www.w3.org/2007/08/xml.xsd",
+    "LicenseId": "W3C-20150513",
+    "License": "W3C Software Notice and Document License (2015-05-13)",
+    "LicenseFile": "xml.xsd-LICENSE",
+    "Copyright": "Copyright © 2007 W3C® (MIT, ERCIM, Keio, Beihang)"
+}
diff --git a/src/xmlpatterns/schema/schemas/xml.xsd-LICENSE b/src/xmlpatterns/schema/schemas/xml.xsd-LICENSE
index 2c687d8..290885a 100644
--- a/src/xmlpatterns/schema/schemas/xml.xsd-LICENSE
+++ b/src/xmlpatterns/schema/schemas/xml.xsd-LICENSE
@@ -1,40 +1,21 @@
-W3C® SOFTWARE NOTICE AND LICENSE
-
-This license came from: http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-This work (and included software, documentation such as READMEs, or other
-related items) is being provided by the copyright holders under the following
-license. By obtaining, using and/or copying this work, you (the licensee)
-agree that you have read, understood, and will comply with the following
-terms and conditions.
-
-Permission to copy, modify, and distribute this software and its
-documentation, with or without modification, for any purpose and without
-fee or royalty is hereby granted, provided that you include the following on
-ALL copies of the software and documentation or portions thereof, including
-modifications:
-
-  1. The full text of this NOTICE in a location viewable to users of the
-     redistributed or derivative work.
-  2. Any pre-existing intellectual property disclaimers, notices, or terms
-     and conditions. If none exist, the W3C Software Short Notice should be
-     included (hypertext is preferred, text is permitted)
-     within the body of any redistributed or derivative code.
-  3. Notice of any changes or modifications to the files, including the date
-     changes were made. (We recommend you provide URIs to the location from
-     which the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
-MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
-PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
-ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
-DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in
-advertising or publicity pertaining to the software without specific, written
-prior permission. Title to copyright in this software and any associated
-documentation will at all times remain with copyright holders.
+W3C® SOFTWARE NOTICE AND LICENSE
+
+This license came from: https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+
+This work is being provided by the copyright holders under the following license.
+
+License
+By obtaining and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the work or portions thereof, including modifications:
+
+ - The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
+ - Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software and Document Short Notice should be included.
+ - Notice of any changes or modifications, through a copyright statement on the new code or document such as "This software or document includes material copied from or derived from [title and URI of the W3C document]. Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the work without specific, written prior permission. Title to copyright in this work will at all times remain with copyright holders.