diff options
| author | Martchus | 2020-09-13 13:27:12 +0200 |
|---|---|---|
| committer | Martchus | 2020-09-13 13:27:12 +0200 |
| commit | 604a6dd6fef49bc1efbe6a90c0d6238feadd8744 (patch) | |
| tree | 29553e265ce08726ed8b24292965a29043acc1a1 /0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch | |
| parent | 15aea6178f5758f36d73cd0fe2b69576e45e43e2 (diff) | |
| download | aur-604a6dd6fef49bc1efbe6a90c0d6238feadd8744.tar.gz | |
Update to 5.15.1
Diffstat (limited to '0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch')
| -rw-r--r-- | 0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch | 8 |
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 05fc84790b45..aa12cac1cd3d 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 7e479b9905ae64f5f0b4e43bbcb29ef65d4ae0ca Mon Sep 17 00:00:00 2001 +From 5652ce8e4225793cb4041be6aadee82d4ac84c27 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 42ccffc..a3849d8 100644 +index 3203096..6adf9eb 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp -@@ -2201,6 +2201,10 @@ void MetaObjectGenerator::readClassInfo() +@@ -2202,6 +2202,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 780d41b..029e10b 100644 } -- -2.26.2 +2.28.0 |