diff options
Diffstat (limited to '0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch')
| -rw-r--r-- | 0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch b/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch index 3b9f834ffece..519321b56f6a 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 99ecce1582c58af2c9b100c8e33ab1b531307c0a Mon Sep 17 00:00:00 2001 +From f373dbba285fe3a6e171dd3d4fa0929d9c006085 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 29d1ae9..dc871c5 100644 +index d85ca1f..86ac48f 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp -@@ -2164,6 +2164,10 @@ void MetaObjectGenerator::readClassInfo() +@@ -2117,6 +2117,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 29d1ae9..dc871c5 100644 break; } diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp -index 400ecce..ef44327 100644 +index c2120b7..978b7ad 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp -@@ -1136,6 +1136,10 @@ int main(int argc, char **argv) +@@ -1111,6 +1111,10 @@ int main(int argc, char **argv) typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString(); if (QFile::exists(typeLib)) break; @@ -40,7 +40,7 @@ index 400ecce..ef44327 100644 } if (!typeLib.isEmpty()) -@@ -1200,6 +1204,10 @@ int main(int argc, char **argv) +@@ -1175,6 +1179,10 @@ int main(int argc, char **argv) typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString(); if (QFile::exists(typeLib)) break; |