2023-07-19 09:07:25 +02:00
|
|
|
From ee8a2e9fcc6c3a85f49a2296a1fc8b6a08d4539c Mon Sep 17 00:00:00 2001
|
2021-04-28 17:11:48 +02:00
|
|
|
From: Martchus <martchus@gmx.net>
|
|
|
|
Date: Fri, 2 Jun 2017 17:21:08 +0200
|
2022-09-11 12:19:18 +02:00
|
|
|
Subject: [PATCH 1/3] Handle win64 in dumpcpp and
|
2021-04-28 17:11:48 +02:00
|
|
|
MetaObjectGenerator::readClassInfo
|
|
|
|
|
|
|
|
See https://bugreports.qt.io/browse/QTBUG-46827
|
|
|
|
---
|
|
|
|
src/activeqt/container/qaxbase.cpp | 4 ++++
|
|
|
|
tools/dumpcpp/main.cpp | 8 ++++++++
|
|
|
|
2 files changed, 12 insertions(+)
|
|
|
|
|
|
|
|
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
|
2023-05-24 22:37:36 +02:00
|
|
|
index 973347b..551c737 100644
|
2021-04-28 17:11:48 +02:00
|
|
|
--- a/src/activeqt/container/qaxbase.cpp
|
|
|
|
+++ b/src/activeqt/container/qaxbase.cpp
|
2023-03-15 10:48:39 +01:00
|
|
|
@@ -2118,6 +2118,10 @@ void MetaObjectGenerator::readClassInfo()
|
2021-04-28 17:11:48 +02:00
|
|
|
const QStringList versions = controls.childGroups();
|
|
|
|
for (const QString &version : versions) {
|
|
|
|
tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win32/.")).toString();
|
|
|
|
+ if(tlfile.isEmpty())
|
|
|
|
+ {
|
|
|
|
+ tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win64/.")).toString();
|
|
|
|
+ }
|
|
|
|
if (!tlfile.isEmpty())
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
|
2023-03-31 23:09:26 +02:00
|
|
|
index 9820a76..222aff0 100644
|
2021-04-28 17:11:48 +02:00
|
|
|
--- a/tools/dumpcpp/main.cpp
|
|
|
|
+++ b/tools/dumpcpp/main.cpp
|
2022-09-29 12:35:43 +02:00
|
|
|
@@ -1111,6 +1111,10 @@ int main(int argc, char **argv)
|
2021-04-28 17:11:48 +02:00
|
|
|
typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString();
|
|
|
|
if (QFile::exists(typeLib))
|
|
|
|
break;
|
|
|
|
+ typeLib = settings.value(QLatin1String("/") + codes.at(c) + QLatin1String("/0/win64/.")).toByteArray();
|
|
|
|
+ if (QFile::exists(typeLib)) {
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!typeLib.isEmpty())
|
2022-09-29 12:35:43 +02:00
|
|
|
@@ -1175,6 +1179,10 @@ int main(int argc, char **argv)
|
2021-04-28 17:11:48 +02:00
|
|
|
typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString();
|
|
|
|
if (QFile::exists(typeLib))
|
|
|
|
break;
|
|
|
|
+ typeLib = settings.value(key + QLatin1String("/") + codes.at(c) + QLatin1String("/win64/.")).toByteArray();
|
|
|
|
+ if (QFile::exists(typeLib)) {
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
--
|
2023-07-19 09:07:25 +02:00
|
|
|
2.41.0
|
2021-04-28 17:11:48 +02:00
|
|
|
|