diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.8/src/activeqt/container/qaxbase.cpp qtactiveqt-everywhere-src-5.15.8-new/src/activeqt/container/qaxbase.cpp
--- qtactiveqt-everywhere-src-5.15.8/src/activeqt/container/qaxbase.cpp 2022-11-10 21:42:16.000000000 +0100
+++ qtactiveqt-everywhere-src-5.15.8-new/src/activeqt/container/qaxbase.cpp 2023-01-09 15:36:32.095166587 +0100
@@ -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();
+ if(tlfile.isEmpty())
+ {
+ tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win64/.")).toString();
+ }
if (!tlfile.isEmpty())
break;
}
diff -rupN --no-dereference qtactiveqt-everywhere-src-5.15.8/tools/dumpcpp/main.cpp qtactiveqt-everywhere-src-5.15.8-new/tools/dumpcpp/main.cpp
--- qtactiveqt-everywhere-src-5.15.8/tools/dumpcpp/main.cpp 2022-11-10 21:42:16.000000000 +0100
+++ qtactiveqt-everywhere-src-5.15.8-new/tools/dumpcpp/main.cpp 2023-01-09 15:36:32.100166596 +0100
@@ -1586,6 +1586,10 @@ int main(int argc, char **argv)
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())
@@ -1650,6 +1654,10 @@ int main(int argc, char **argv)
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;
+ }
}
}