From 867ab5872447b80d65ba4a9f116769cdf4016edb Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 17:21:08 +0200 Subject: [PATCH 1/3] 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 3463f3c..88d3249 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -2118,6 +2118,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 1b6fbeb..679bf9e 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp @@ -1126,6 +1126,10 @@ int main(int argc, char **argv) typeLib = settings.value(keyPrefix + QLatin1String("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()) @@ -1190,6 +1194,10 @@ int main(int argc, char **argv) typeLib = settings.value(keyPrefix + 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.44.0