40 lines
2.0 KiB
Diff
40 lines
2.0 KiB
Diff
diff -Naur qt-everywhere-src-5.12.4-orig/qtactiveqt/src/activeqt/container/qaxbase.cpp qt-everywhere-src-5.12.4/qtactiveqt/src/activeqt/container/qaxbase.cpp
|
|
--- qt-everywhere-src-5.12.4-orig/qtactiveqt/src/activeqt/container/qaxbase.cpp 2019-05-23 15:20:41.000000000 +0300
|
|
+++ qt-everywhere-src-5.12.4/qtactiveqt/src/activeqt/container/qaxbase.cpp 2019-06-15 16:18:41.635993400 +0300
|
|
@@ -2177,6 +2177,10 @@
|
|
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 -Naur qt-everywhere-src-5.12.4-orig/qtactiveqt/tools/dumpcpp/main.cpp qt-everywhere-src-5.12.4/qtactiveqt/tools/dumpcpp/main.cpp
|
|
--- qt-everywhere-src-5.12.4-orig/qtactiveqt/tools/dumpcpp/main.cpp 2019-05-23 15:20:41.000000000 +0300
|
|
+++ qt-everywhere-src-5.12.4/qtactiveqt/tools/dumpcpp/main.cpp 2019-06-15 16:18:41.635993400 +0300
|
|
@@ -1552,6 +1552,10 @@
|
|
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 @@
|
|
+ QLatin1String("/win32/.")).toString();
|
|
if (QFile::exists(typeLib))
|
|
break;
|
|
+ typeLib = settings.value(key + QLatin1String("/") + codes.at(c) + QLatin1String("/win64/.")).toByteArray();
|
|
+ if (QFile::exists(typeLib)) {
|
|
+ break;
|
|
+ }
|
|
}
|
|
}
|
|
|