Blob Blame Raw
diff -rupN --no-dereference qtactiveqt-everywhere-src-5.12.5/src/activeqt/container/qaxbase.cpp qtactiveqt-everywhere-src-5.12.5-new/src/activeqt/container/qaxbase.cpp
--- qtactiveqt-everywhere-src-5.12.5/src/activeqt/container/qaxbase.cpp	2019-08-23 13:35:38.000000000 +0200
+++ qtactiveqt-everywhere-src-5.12.5-new/src/activeqt/container/qaxbase.cpp	2019-09-25 14:44:07.407685410 +0200
@@ -2177,6 +2177,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.12.5/tools/dumpcpp/main.cpp qtactiveqt-everywhere-src-5.12.5-new/tools/dumpcpp/main.cpp
--- qtactiveqt-everywhere-src-5.12.5/tools/dumpcpp/main.cpp	2019-08-23 13:35:38.000000000 +0200
+++ qtactiveqt-everywhere-src-5.12.5-new/tools/dumpcpp/main.cpp	2019-09-25 14:44:07.407685410 +0200
@@ -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;
+            }
         }
     }