Merge tag 'v5.15.3-lts' into tqtc/lts-5.15-opensource

Qt For Python Release 5.15.3

Change-Id: Ia936efcdfa8196b02528905c12cc7764553d6ca8

1 files changed, 9 insertions, 12 deletions

diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangutils.h b/sources/shiboken2/ApiExtractor/clangparser/clangutils.h
index 41d0af460..239136da9 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/clangutils.h
+++ b/sources/shiboken2/ApiExtractor/clangparser/clangutils.h
@@ -1,11 +1,12 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt for Python.
 **
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** $QT_BEGIN_LICENSE:COMM$
+**
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
@@ -14,14 +15,6 @@
 ** and conditions see https://www.qt.io/terms-conditions. For further
 ** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -68,7 +61,7 @@ struct SourceLocation
 {
     bool equals(const SourceLocation &rhs) const;
 
-    CXFile file;
+    CXFile file = nullptr;
     unsigned line = 0;
     unsigned column = 0;
     unsigned offset = 0;
@@ -96,10 +89,14 @@ struct Diagnostic {
     static Diagnostic fromCXDiagnostic(CXDiagnostic cd);
     // Other
     explicit Diagnostic(const QString &m, const CXCursor &c, CXDiagnosticSeverity s = CXDiagnostic_Warning);
+    void setLocation(const SourceLocation &);
 
     QString message;
     QStringList childMessages;
-    SourceLocation location;
+    QString file;
+    unsigned line = 0;
+    unsigned column = 0;
+    unsigned offset = 0;
     Source source = Clang;
     CXDiagnosticSeverity severity = CXDiagnostic_Warning;
 };