Update to 5.9.0

1 files changed, 56 insertions, 0 deletions

diff --git a/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch b/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
new file mode 100644
index 000000000000..208968473a07
--- /dev/null
+++ b/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
@@ -0,0 +1,56 @@
+From c8c5802c04b4fbd7fc34ba70af93851a35294741 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
+ MetaObjectGenerator::readClassInfo
+
+See https://bugreports.qt.io/browse/QTBUG-46827
+---
+ src/activeqt/container/qaxbase.cpp | 4 ++++
+ tools/dumpcpp/main.cpp             | 8 ++++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
+index 22aec57..64b2f47 100644
+--- a/src/activeqt/container/qaxbase.cpp
++++ b/src/activeqt/container/qaxbase.cpp
+@@ -2170,6 +2170,10 @@ void MetaObjectGenerator::readClassInfo()
+             const QStringList versions = controls.childGroups();
+             for (const QString &version : versions) {
+                 tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win32/.")).toString();
++                if(tlfile.isEmpty())
++                {
++                  tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win64/.")).toString();
++                }
+                 if (!tlfile.isEmpty())
+                     break;
+             }
+diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
+index 97915c1..ae41289 100644
+--- a/tools/dumpcpp/main.cpp
++++ b/tools/dumpcpp/main.cpp
+@@ -1539,6 +1539,10 @@ int main(int argc, char **argv)
+             typeLib = settings.value(QLatin1Char('/') + codes.at(c) + QLatin1String("/0/win32/.")).toString();
+             if (QFile::exists(typeLib))
+                 break;
++            typeLib = settings.value(QLatin1String("/") + codes.at(c) + QLatin1String("/0/win64/.")).toByteArray();
++            if (QFile::exists(typeLib)) {
++                break;
++            }
+         }
+ 
+         if (!typeLib.isEmpty())
+@@ -1598,6 +1602,10 @@ int main(int argc, char **argv)
+                                      + QLatin1String("/win32/.")).toString();
+             if (QFile::exists(typeLib))
+                 break;
++            typeLib = settings.value(key + QLatin1String("/") + codes.at(c) + QLatin1String("/win64/.")).toByteArray();
++            if (QFile::exists(typeLib)) {
++                break;
++            }
+         }
+     }
+ 
+-- 
+2.13.0
+