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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch b/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch index 108d5d1686a5..00adeee2699e 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 2e1615636b001f1b610ac3c75f0f14279148ab81 Mon Sep 17 00:00:00 2001 +From 2abaa0a24d84a3fe1a1d96035b4bcb6425808fe7 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 2 Jun 2017 17:21:08 +0200 Subject: [PATCH 1/2] Handle win64 in dumpcpp and @@ -11,7 +11,7 @@ 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 4944c3b..f92d18b 100644 +index c97ad9a..37f9f94 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -2104,6 +2104,10 @@ void MetaObjectGenerator::readClassInfo() @@ -26,10 +26,10 @@ index 4944c3b..f92d18b 100644 break; } diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp -index 60e5c94..b2ea4eb 100644 +index 162c6c6..04a2baa 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp -@@ -1090,6 +1090,10 @@ int main(int argc, char **argv) +@@ -1106,6 +1106,10 @@ int main(int argc, char **argv) typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString(); if (QFile::exists(typeLib)) break; @@ -40,7 +40,7 @@ index 60e5c94..b2ea4eb 100644 } if (!typeLib.isEmpty()) -@@ -1154,6 +1158,10 @@ int main(int argc, char **argv) +@@ -1170,6 +1174,10 @@ int main(int argc, char **argv) typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString(); if (QFile::exists(typeLib)) break; |