diff -rupN qtactiveqt-opensource-src-5.4.1/src/activeqt/container/qaxbase.cpp qtactiveqt-opensource-src-5.4.1-new/src/activeqt/container/qaxbase.cpp
--- qtactiveqt-opensource-src-5.4.1/src/activeqt/container/qaxbase.cpp 2015-02-17 05:56:13.000000000 +0100
+++ qtactiveqt-opensource-src-5.4.1-new/src/activeqt/container/qaxbase.cpp 2015-06-23 16:41:44.483979750 +0200
@@ -2187,6 +2187,10 @@ void MetaObjectGenerator::readClassInfo(
QString version = *vit;
++vit;
tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win32/.")).toString();
+ if(tlfile.isEmpty())
+ {
+ tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win64/.")).toString();
+ }
}
controls.endGroup();
} else {
diff -rupN qtactiveqt-opensource-src-5.4.1/tools/dumpcpp/main.cpp qtactiveqt-opensource-src-5.4.1-new/tools/dumpcpp/main.cpp
--- qtactiveqt-opensource-src-5.4.1/tools/dumpcpp/main.cpp 2015-02-17 05:56:13.000000000 +0100
+++ qtactiveqt-opensource-src-5.4.1-new/tools/dumpcpp/main.cpp 2015-06-23 16:35:53.157273425 +0200
@@ -1591,6 +1591,10 @@ int main(int argc, char **argv)
if (QFile::exists(QString::fromLatin1(typeLib))) {
break;
}
+ typeLib = settings.value(QLatin1String("/") + codes.at(c) + QLatin1String("/0/win64/.")).toByteArray();
+ if (QFile::exists(QString::fromLatin1(typeLib))) {
+ break;
+ }
}
if (!typeLib.isEmpty())
@@ -1654,6 +1658,10 @@ int main(int argc, char **argv)
if (QFile::exists(QString::fromLatin1(typeLib.constData()))) {
break;
}
+ typeLib = settings.value(key + QLatin1String("/") + codes.at(c) + QLatin1String("/win64/.")).toByteArray();
+ if (QFile::exists(QString::fromLatin1(typeLib.constData()))) {
+ break;
+ }
}
}