diff options
| -rw-r--r-- | tools/dumpcpp/main.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp index 4545c60..a7dbbea 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp @@ -1087,7 +1087,13 @@ int main(int argc, char **argv) typeLib.clear(); QStringList codes = settings.childGroups(); for (int c = 0; c < codes.count(); ++c) { - typeLib = settings.value(QLatin1Char('/') + codes.at(c) + QLatin1String("/0/win32/.")).toString(); + const QString keyPrefix = QLatin1Char('/') + codes.at(c) + QLatin1String("/0/"); + if (QT_POINTER_SIZE == 8) { + typeLib = settings.value(keyPrefix + QLatin1String("win64/.")).toString(); + if (QFile::exists(typeLib)) + break; + } + typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString(); if (QFile::exists(typeLib)) break; } @@ -1145,8 +1151,13 @@ int main(int argc, char **argv) settings.endGroup(); for (int c = 0; c < codes.count(); ++c) { - typeLib = settings.value(key + QLatin1Char('/') + codes.at(c) - + QLatin1String("/win32/.")).toString(); + const QString keyPrefix = key + QLatin1Char('/') + codes.at(c) + QLatin1Char('/'); + if (QT_POINTER_SIZE == 8) { + typeLib = settings.value(keyPrefix + QLatin1String("win64/.")).toString(); + if (QFile::exists(typeLib)) + break; + } + typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString(); if (QFile::exists(typeLib)) break; } |