diff -rupN qtactiveqt-opensource-src-5.7.1/src/activeqt/container/qaxbase.cpp qtactiveqt-opensource-src-5.7.1-new/src/activeqt/container/qaxbase.cpp
--- qtactiveqt-opensource-src-5.7.1/src/activeqt/container/qaxbase.cpp 2016-10-24 07:01:50.000000000 +0200
+++ qtactiveqt-opensource-src-5.7.1-new/src/activeqt/container/qaxbase.cpp 2017-02-03 22:48:24.143006019 +0100
@@ -2170,6 +2170,10 @@ void MetaObjectGenerator::readClassInfo(
QStringList versions = controls.childGroups();
foreach (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-opensource-src-5.7.1/tools/dumpcpp/main.cpp qtactiveqt-opensource-src-5.7.1-new/tools/dumpcpp/main.cpp
--- qtactiveqt-opensource-src-5.7.1/tools/dumpcpp/main.cpp 2016-10-24 07:01:50.000000000 +0200
+++ qtactiveqt-opensource-src-5.7.1-new/tools/dumpcpp/main.cpp 2017-02-03 22:48:24.144006016 +0100
@@ -1538,6 +1538,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())
@@ -1597,6 +1601,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;
+ }
}
}