Update to 5.13.0

1 files changed, 7 insertions, 7 deletions

diff --git a/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch b/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
index 8b6251895039..62f37b5cdf37 100644
--- a/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
+++ b/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
@@ -1,4 +1,4 @@
-From 5422de18cdf70893fbe166644a3687c99a08038f Mon Sep 17 00:00:00 2001
+From c21f38e09b62405086eb4099f8706a7d5debc0af Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 17:21:08 +0200
 Subject: [PATCH 2/2] Handle win64 in dumpcpp and
@@ -11,10 +11,10 @@ See https://bugreports.qt.io/browse/QTBUG-46827
  2 files changed, 12 insertions(+)
 
 diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
-index 722a389..66499cb 100644
+index d87217f..43a4ed8 100644
 --- a/src/activeqt/container/qaxbase.cpp
 +++ b/src/activeqt/container/qaxbase.cpp
-@@ -2176,6 +2176,10 @@ void MetaObjectGenerator::readClassInfo()
+@@ -2209,6 +2209,10 @@ void MetaObjectGenerator::readClassInfo()
              const QStringList versions = controls.childGroups();
              for (const QString &version : versions) {
                  tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win32/.")).toString();
@@ -26,10 +26,10 @@ index 722a389..66499cb 100644
                      break;
              }
 diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
-index 4601aef..65eee94 100644
+index eb6f70a..d9d1bdf 100644
 --- a/tools/dumpcpp/main.cpp
 +++ b/tools/dumpcpp/main.cpp
-@@ -1539,6 +1539,10 @@ int main(int argc, char **argv)
+@@ -1552,6 +1552,10 @@ int main(int argc, char **argv)
              typeLib = settings.value(QLatin1Char('/') + codes.at(c) + QLatin1String("/0/win32/.")).toString();
              if (QFile::exists(typeLib))
                  break;
@@ -40,7 +40,7 @@ index 4601aef..65eee94 100644
          }
  
          if (!typeLib.isEmpty())
-@@ -1598,6 +1602,10 @@ int main(int argc, char **argv)
+@@ -1611,6 +1615,10 @@ int main(int argc, char **argv)
                                       + QLatin1String("/win32/.")).toString();
              if (QFile::exists(typeLib))
                  break;
@@ -52,5 +52,5 @@ index 4601aef..65eee94 100644
      }
  
 -- 
-2.21.0
+2.22.0