From 1ab5d14615f713a87141b66675521d702542d3a6 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Mon, 22 Jan 2018 09:40:52 +0100
Subject: 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>
---
 tools/qmlcachegen/qmlcache.prf    | 15 +--------------
 tools/qmlcachegen/qmlcachegen.cpp | 29 ++++-------------------------
 2 files changed, 5 insertions(+), 39 deletions(-)

(limited to 'tools')

diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf
index dfb06cb760..537eaf62ea 100644
--- a/tools/qmlcachegen/qmlcache.prf
+++ b/tools/qmlcachegen/qmlcache.prf
@@ -3,23 +3,10 @@ static {
     return()
 }
 
-android {
-    message("QML cache generation ahead of time is not supported on Android")
-    return()
-}
-
 qtPrepareTool(QML_CACHEGEN, qmlcachegen, _ARCH_CHECK)
 
 isEmpty(TARGETPATH): error("Must set TARGETPATH (QML import name) for ahead-of-time QML cache generation")
 
-!isEmpty(QT_TARGET_ARCH):QML_CACHEGEN_ARCH=$$QT_TARGET_ARCH
-else:QML_CACHEGEN_ARCH=$$QT_ARCH
-
-!isEmpty(QT_TARGET_BUILDABI):QML_CACHEGEN_ABI=$$QT_TARGET_BUILDABI
-else:QML_CACHEGEN_ABI=$$QT_BUILDABI
-
-QML_CACHEGEN_ARGS=--target-architecture=$$QML_CACHEGEN_ARCH --target-abi=$$QML_CACHEGEN_ABI
-
 load(qt_build_paths)
 
 prefix_build: QMLCACHE_DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
@@ -45,7 +32,7 @@ qmlcacheinst.CONFIG = no_check_exist
 qmlcachegen.input = CACHEGEN_FILES
 qmlcachegen.output = ${QMAKE_FUNC_FILE_IN_qmlCacheOutputFileName}
 qmlcachegen.CONFIG = no_link target_predeps
-qmlcachegen.commands = $$QML_CACHEGEN $$QML_CACHEGEN_ARGS -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
+qmlcachegen.commands = $$QML_CACHEGEN -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
 qmlcachegen.name = Generate QML Cache ${QMAKE_FILE_IN}
 qmlcachegen.variable_out = GENERATED_FILES
 
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;
         }
-- 
cgit v1.2.3