summarylogtreecommitdiffstats
path: root/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
diff options
context:
space:
mode:
authorMartchus2017-12-14 01:06:31 +0100
committerMartchus2017-12-14 01:06:31 +0100
commit4c143d65d598e69dba64195e3f46c0315e4c3dcb (patch)
treea1b7502ac5e35ca8dc795a93379ffb7073168c5e /0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
parent28cec14ef64919139617b1785eeb8194cda14a3f (diff)
downloadaur-4c143d65d598e69dba64195e3f46c0315e4c3dcb.tar.gz
Update to 5.10.0
Diffstat (limited to '0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch')
-rw-r--r--0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch b/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
index e82bc22f6f0b..0d76c7a0084a 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 ba803e4196000080e8e5b5abce811e54318eb08e Mon Sep 17 00:00:00 2001
+From 986644a25ba7d02fb0044b1cb163329e2b8f4e89 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 cd564d3..f3c55b1 100644
+index aa66398..087b83c 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
-@@ -2170,6 +2170,10 @@ void MetaObjectGenerator::readClassInfo()
+@@ -2180,6 +2180,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 1f0cca8..d26bd78 100644
}
--
-2.14.2
+2.15.1