qtsaferenderer: remove unneeded patches

Change-Id: Ifedd2b2b7c2a0d76c42cbdcaf5188625e0f88a6f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

3 files changed, 0 insertions, 105 deletions

diff --git a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0001-Fix-build-with-Qt-5.15.patch b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0001-Fix-build-with-Qt-5.15.patch
deleted file mode 100644
index fc13a3ff..00000000
--- a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0001-Fix-build-with-Qt-5.15.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 65e73f26191192d6a55a778eece753851623a346 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Mon, 16 Mar 2020 08:23:27 +0200
-Subject: [PATCH] Fix build with Qt 5.15
-
-Adapt to internal QML API changes.
-
-Task-number: QSR-643
-Change-Id: Iec2ff7276dccce5eca7f6816f6e459177aa21850
----
- tools/qtsafelayouttool/qmlvisitor.cpp     | 2 +-
- tools/qtsafelayouttool/qmlvisitor.h       | 4 ++--
- tools/qtsafelayouttool/qsafeqmlparser.cpp | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tools/qtsafelayouttool/qmlvisitor.cpp b/tools/qtsafelayouttool/qmlvisitor.cpp
-index 85976a1..95aaae4 100644
---- a/tools/qtsafelayouttool/qmlvisitor.cpp
-+++ b/tools/qtsafelayouttool/qmlvisitor.cpp
-@@ -210,7 +210,7 @@ void QmlSafeLayoutVisitor::endVisit(QQmlJS::AST::FunctionDeclaration*)
-     //Not implemented
- }
- 
--QString QmlSafeLayoutVisitor::nodeValue(const QQmlJS::AST::SourceLocation &start, const QQmlJS::AST::SourceLocation &end)
-+QString QmlSafeLayoutVisitor::nodeValue(const QQmlJS::SourceLocation &start, const QQmlJS::SourceLocation &end)
- {
-     QString ret = QStringRef(&document, start.offset, end.offset + end.length - start.offset).toString();
- 
-diff --git a/tools/qtsafelayouttool/qmlvisitor.h b/tools/qtsafelayouttool/qmlvisitor.h
-index 98596ad..e96d8d0 100644
---- a/tools/qtsafelayouttool/qmlvisitor.h
-+++ b/tools/qtsafelayouttool/qmlvisitor.h
-@@ -75,7 +75,7 @@ public:
-                   QQmlJS::Engine *engine, QObject *parent=nullptr);
-     virtual ~QmlSafeLayoutVisitor() Q_DECL_OVERRIDE;
- 
--    QQmlJS::AST::SourceLocation precedingComment(quint32 offset) const;
-+    QQmlJS::SourceLocation precedingComment(quint32 offset) const;
-     bool visit(QQmlJS::AST::UiImport *) Q_DECL_OVERRIDE;
-     void endVisit(QQmlJS::AST::UiImport *definition) Q_DECL_OVERRIDE;
- 
-@@ -118,7 +118,7 @@ signals:
- 
- protected:
-     QString getFullyQualifiedId(QQmlJS::AST::UiQualifiedId *id);
--    QString nodeValue(const QQmlJS::AST::SourceLocation &start, const QQmlJS::AST::SourceLocation &end);
-+    QString nodeValue(const QQmlJS::SourceLocation &start, const QQmlJS::SourceLocation &end);
-     QString removeLeadingAndTrailingChars(QString str);
-     Node* createNode(const QString& type, Node* parent);
-     void setNameValuePair(Node* node, const QString& name, const QString& value);
-diff --git a/tools/qtsafelayouttool/qsafeqmlparser.cpp b/tools/qtsafelayouttool/qsafeqmlparser.cpp
-index 16216fb..23b7ae4 100644
---- a/tools/qtsafelayouttool/qsafeqmlparser.cpp
-+++ b/tools/qtsafelayouttool/qsafeqmlparser.cpp
-@@ -114,7 +114,7 @@ void QSafeQmlParser::parseSourceFile(const QString& filePath, const NodeContaine
-             }
- 
-             for (auto msg : parser.diagnosticMessages()) {
--#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) && QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
-                 qDebug().nospace() << qPrintable(filePath) << ':' << msg.line
-                                    << ": QML syntax error at col " << msg.column
-                                    << ": " << qPrintable(msg.message);
diff --git a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0004-Add-missing-includes.patch b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0004-Add-missing-includes.patch
deleted file mode 100644
index fc52a760..00000000
--- a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0004-Add-missing-includes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From aa464b04f2d06e85441503bcd258d81686a72907 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Wed, 27 Nov 2019 13:37:12 +0200
-Subject: [PATCH] Add missing includes
-
-Build fails now with Qt 5.14 where syncqt has been fixed to not create
-incorrect QList header which was used here as well.
-
-Task-number: QSR-592
-Change-Id: I8fdc2f37e02fcb3422680721670c76c3a3b08856
----
- tools/qtsafelayouttool/item.h | 2 ++
- tools/qtsafelayouttool/node.h | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/tools/qtsafelayouttool/item.h b/tools/qtsafelayouttool/item.h
-index 257be61..689231d 100644
---- a/tools/qtsafelayouttool/item.h
-+++ b/tools/qtsafelayouttool/item.h
-@@ -28,7 +28,9 @@
- #ifndef ITEM_H
- #define ITEM_H
- 
-+#include <QObject>
- #include <QPoint>
-+#include <QRect>
- #include "node.h"
- 
- QT_BEGIN_NAMESPACE
-diff --git a/tools/qtsafelayouttool/node.h b/tools/qtsafelayouttool/node.h
-index d4c2298..43274e4 100644
---- a/tools/qtsafelayouttool/node.h
-+++ b/tools/qtsafelayouttool/node.h
-@@ -30,6 +30,7 @@
- 
- #include <QString>
- #include <QList>
-+#include <QMap>
- 
- QT_BEGIN_NAMESPACE
- 
diff --git a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb
index 6eaba17a..fa4001f0 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb
@@ -51,7 +51,6 @@ BRANCH = "1.1"
 SRC_URI = "\
     git://codereview.qt-project.org/tqtc-boot2qt/qtsaferenderer;branch=${BRANCH};protocol=ssh;sdk-uri=Src/QtSafeRenderer-1.1.2 \
     file://0001-Fix-yocto-build-issues.patch \
-    file://0001-Fix-build-with-Qt-5.15.patch \
     "
 SRCREV = "ac0349c1f5d5486e1f8ecaf1db2e1221ff9f0837"