diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2018-01-22 09:40:52 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-01-22 09:21:38 +0000 |
commit | 1ab5d14615f713a87141b66675521d702542d3a6 (patch) | |
tree | 83ab229fbbd08d39cfb4637240008bf012c10491 /tools/qmlcachegen/qmlcachegen.cpp | |
parent | f562a7d99aeaff85f964b0ad75f94fb85e3ddd11 (diff) |
Minor data structure cleanup
The cache files are architecture and ABI independent, so we can remove
any associated field/code as well as the workaround for Android.
Change-Id: Ia52a5be886fc22a2105460e003e7a76af7dc1818
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tools/qmlcachegen/qmlcachegen.cpp')
-rw-r--r-- | tools/qmlcachegen/qmlcachegen.cpp | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp index 807a213f14..18f8f79ba3 100644 --- a/tools/qmlcachegen/qmlcachegen.cpp +++ b/tools/qmlcachegen/qmlcachegen.cpp @@ -135,10 +135,9 @@ static bool checkArgumentsObjectUseInSignalHandlers(const QmlIR::Document &doc, return true; } -static bool compileQmlFile(const QString &inputFileName, const QString &outputFileName, const QString &targetABI, Error *error) +static bool compileQmlFile(const QString &inputFileName, const QString &outputFileName, Error *error) { QmlIR::Document irDocument(/*debugMode*/false); - irDocument.jsModule.targetABI = targetABI; QString sourceCode; { @@ -218,10 +217,9 @@ static bool compileQmlFile(const QString &inputFileName, const QString &outputFi return true; } -static bool compileJSFile(const QString &inputFileName, const QString &outputFileName, const QString &targetABI, Error *error) +static bool compileJSFile(const QString &inputFileName, const QString &outputFileName, Error *error) { QmlIR::Document irDocument(/*debugMode*/false); - irDocument.jsModule.targetABI = targetABI; QString sourceCode; { @@ -322,12 +320,6 @@ int main(int argc, char **argv) parser.addHelpOption(); parser.addVersionOption(); - QCommandLineOption targetArchitectureOption(QStringLiteral("target-architecture"), QCoreApplication::translate("main", "Target architecture"), QCoreApplication::translate("main", "architecture")); - parser.addOption(targetArchitectureOption); - - QCommandLineOption targetABIOption(QStringLiteral("target-abi"), QCoreApplication::translate("main", "Target architecture binary interface"), QCoreApplication::translate("main", "abi")); - parser.addOption(targetABIOption); - QCommandLineOption outputFileOption(QStringLiteral("o"), QCoreApplication::translate("main", "Output file name"), QCoreApplication::translate("main", "file name")); parser.addOption(outputFileOption); @@ -339,17 +331,6 @@ int main(int argc, char **argv) parser.process(app); - if (!parser.isSet(targetArchitectureOption)) { - fprintf(stderr, "Target architecture not specified. Please specify with --target-architecture=<arch>\n"); - parser.showHelp(); - return EXIT_FAILURE; - } - - // Since we're now storing bytecode in the cache, the --check-if-supported option - // doesn't make sense anymore. Return EXIT_SUCCESS for backwards compatibility. - if (parser.isSet(checkIfSupportedOption)) - return EXIT_SUCCESS; - const QStringList sources = parser.positionalArguments(); if (sources.isEmpty()){ parser.showHelp(); @@ -365,15 +346,13 @@ int main(int argc, char **argv) if (parser.isSet(outputFileOption)) outputFileName = parser.value(outputFileOption); - const QString targetABI = parser.value(targetABIOption); - if (inputFile.endsWith(QLatin1String(".qml"))) { - if (!compileQmlFile(inputFile, outputFileName, targetABI, &error)) { + if (!compileQmlFile(inputFile, outputFileName, &error)) { error.augment(QLatin1String("Error compiling qml file: ")).print(); return EXIT_FAILURE; } } else if (inputFile.endsWith(QLatin1String(".js"))) { - if (!compileJSFile(inputFile, outputFileName, targetABI, &error)) { + if (!compileJSFile(inputFile, outputFileName, &error)) { error.augment(QLatin1String("Error compiling qml file: ")).print(); return EXIT_FAILURE; } |