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 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch b/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch index e8340f0a775b..3b9f834ffece 100644 --- a/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch +++ b/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch @@ -1,7 +1,7 @@ -From 11bf98cd89b7169d81352ba7f652661964531751 Mon Sep 17 00:00:00 2001 +From 99ecce1582c58af2c9b100c8e33ab1b531307c0a 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 +Subject: [PATCH 1/3] Handle win64 in dumpcpp and MetaObjectGenerator::readClassInfo See https://bugreports.qt.io/browse/QTBUG-46827 @@ -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 c97ad9a..37f9f94 100644 +index 29d1ae9..dc871c5 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp -@@ -2104,6 +2104,10 @@ void MetaObjectGenerator::readClassInfo() +@@ -2164,6 +2164,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 c97ad9a..37f9f94 100644 break; } diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp -index 3142265..8188657 100644 +index 400ecce..ef44327 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp -@@ -1106,6 +1106,10 @@ int main(int argc, char **argv) +@@ -1136,6 +1136,10 @@ int main(int argc, char **argv) typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString(); if (QFile::exists(typeLib)) break; @@ -40,7 +40,7 @@ index 3142265..8188657 100644 } if (!typeLib.isEmpty()) -@@ -1170,6 +1174,10 @@ int main(int argc, char **argv) +@@ -1200,6 +1204,10 @@ int main(int argc, char **argv) typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString(); if (QFile::exists(typeLib)) break; @@ -52,5 +52,5 @@ index 3142265..8188657 100644 } -- -2.36.1 +2.37.3 |