diff -rupN --no-dereference qtactiveqt-everywhere-src-5.13.2/src/activeqt/container/qaxbase.cpp qtactiveqt-everywhere-src-5.13.2-new/src/activeqt/container/qaxbase.cpp
--- qtactiveqt-everywhere-src-5.13.2/src/activeqt/container/qaxbase.cpp 2019-10-14 12:20:33.000000000 +0200
+++ qtactiveqt-everywhere-src-5.13.2-new/src/activeqt/container/qaxbase.cpp 2019-12-11 10:19:29.405709322 +0100
@@ -2209,6 +2209,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.13.2/tools/dumpcpp/main.cpp qtactiveqt-everywhere-src-5.13.2-new/tools/dumpcpp/main.cpp
--- qtactiveqt-everywhere-src-5.13.2/tools/dumpcpp/main.cpp 2019-10-14 12:20:33.000000000 +0200
+++ qtactiveqt-everywhere-src-5.13.2-new/tools/dumpcpp/main.cpp 2019-12-11 10:19:29.406709337 +0100
@@ -1552,6 +1552,10 @@ int main(int argc, char **argv)
typeLib = settings.value(QLatin1Char('/') + codes.at(c) + QLatin1String("/0/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())
@@ -1611,6 +1615,10 @@ int main(int argc, char **argv)
+ QLatin1String("/win32/.")).toString();
if (QFile::exists(typeLib))
break;
+ typeLib = settings.value(key + QLatin1String("/") + codes.at(c) + QLatin1String("/win64/.")).toByteArray();
+ if (QFile::exists(typeLib)) {
+ break;
+ }
}
}