diff -rupN qtactiveqt-everywhere-src-5.11.3/src/activeqt/container/qaxbase.cpp qtactiveqt-everywhere-src-5.11.3-new/src/activeqt/container/qaxbase.cpp
--- qtactiveqt-everywhere-src-5.11.3/src/activeqt/container/qaxbase.cpp 2018-11-19 06:22:00.000000000 +0100
+++ qtactiveqt-everywhere-src-5.11.3-new/src/activeqt/container/qaxbase.cpp 2019-01-14 15:47:38.809834020 +0100
@@ -2180,6 +2180,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 qtactiveqt-everywhere-src-5.11.3/tools/dumpcpp/main.cpp qtactiveqt-everywhere-src-5.11.3-new/tools/dumpcpp/main.cpp
--- qtactiveqt-everywhere-src-5.11.3/tools/dumpcpp/main.cpp 2018-11-19 06:22:00.000000000 +0100
+++ qtactiveqt-everywhere-src-5.11.3-new/tools/dumpcpp/main.cpp 2019-01-14 15:47:38.810834019 +0100
@@ -1539,6 +1539,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())
@@ -1598,6 +1602,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;
+ }
}
}