From 0d9d35f6a84d19a5767d7d4bd59c07f1118ed31b Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 17:21:08 +0200 Subject: [PATCH 2/2] Handle win64 in dumpcpp and MetaObjectGenerator::readClassInfo See https://bugreports.qt.io/browse/QTBUG-46827 --- src/activeqt/container/qaxbase.cpp | 4 ++++ tools/dumpcpp/main.cpp | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp index 1262944..5cad4bf 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -2204,6 +2204,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 --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp index 86699eb..4e454f8 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp @@ -1580,6 +1580,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()) @@ -1639,6 +1643,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; + } } } -- 2.26.0