diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | tools/dumpcpp/main.cpp | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/.qmake.conf b/.qmake.conf index fd7c2fa..a9b6a32 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.5.1 +MODULE_VERSION = 5.6.0 diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp index 692ae67..c65d5cd 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp @@ -54,8 +54,7 @@ static ITypeInfo *currentTypeInfo = 0; enum ProgramMode { GenerateMode, - TypeLibID, - DoNothing + TypeLibID }; enum ObjectCategory @@ -1476,9 +1475,6 @@ static void parseOptions(Options *options) QCommandLineOption noImplementationOption(QStringLiteral("decl"), QStringLiteral("Only generate the .h file.")); parser.addOption(noImplementationOption); - QCommandLineOption doNothingOption(QStringLiteral("donothing"), - QStringLiteral("Do not generate any files.")); - parser.addOption(doNothingOption); QCommandLineOption compatOption(QStringLiteral("compat"), QStringLiteral("Treat all coclass parameters as IDispatch.")); parser.addOption(compatOption); @@ -1500,8 +1496,6 @@ static void parseOptions(Options *options) options->category |= NoDeclaration; if (parser.isSet(noImplementationOption)) options->category |= NoImplementation; - if (parser.isSet(doNothingOption)) - options->mode = DoNothing; options->dispatchEqualsIDispatch = parser.isSet(compatOption); if (parser.isSet(getFileOption)) { options->typeLib = parser.value(getFileOption); @@ -1545,9 +1539,6 @@ int main(int argc, char **argv) return 0; } - if (options.mode == DoNothing) - return 0; - if (typeLib.isEmpty()) { qWarning("dumpcpp: No object class or type library name provided.\n" " Use -h for help."); |