summarylogtreecommitdiffstats
path: root/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
diff options
context:
space:
mode:
Diffstat (limited to '0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch')
-rw-r--r--0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch b/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
index cff9f243bbc3..598270d2bb2b 100644
--- a/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
+++ b/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
@@ -1,4 +1,4 @@
-From 6a4bb1150e82c388661552c77e39b373c3c34e99 Mon Sep 17 00:00:00 2001
+From 510fd537b1f6329d429b51e19d593214605d1b4a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 17:21:08 +0200
Subject: [PATCH 1/3] 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 d85ca1f..86ac48f 100644
+index c3b9b0a..ee19ffe 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
-@@ -2117,6 +2117,10 @@ void MetaObjectGenerator::readClassInfo()
+@@ -2118,6 +2118,10 @@ void MetaObjectGenerator::readClassInfo()
const QStringList versions = controls.childGroups();
for (const QString &version : versions) {
tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win32/.")).toString();
@@ -52,5 +52,5 @@ index fc8bf8c..435ab1e 100644
}
--
-2.39.0
+2.39.2