Android: Rename opt-in CMake flag that generates QML to Java code

The Java QtQmlComponent has been renamed to QtQuickViewContent
as a part of API reviews.
As a result, we also change the opt-in flag
From QT_ANDROID_GENERATE_JAVA_QML_COMPONENTS
To QT_ANDROID_GENERATE_JAVA_QTQUICKVIEW_CONTENTS
that adds an entry to the android-deployment-settings.json.
The flags later will be used by androiddeployqt to enable the
generation of QtQuickViewContent extensions.

Pick-to: 6.8
Task-number: QTBUG-126976
Task-number: QTBUG-127091
Change-Id: Ie08a9430a5e5a16809f78389144a4a6dfd87ce18
Reviewed-by: Tinja Paavoseppä <[email protected]>
Reviewed-by: Nicholas Bennett <[email protected]>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index ec19cbb9317..9ff9ab277f0 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -1302,13 +1302,13 @@ bool readInputFile(Options *options)
     }
 
     {
-        const QJsonValue genJavaQmlComponents = jsonObject.value("generate-java-qml-components"_L1);
+        const QJsonValue genJavaQmlComponents = jsonObject.value("generate-java-qtquickview-contents"_L1);
         if (!genJavaQmlComponents.isUndefined() && genJavaQmlComponents.isBool()) {
             options->generateJavaQmlComponents = genJavaQmlComponents.toBool(false);
             if (options->generateJavaQmlComponents && !options->buildAar) {
                 fprintf(stderr,
-                        "Warning: Skipping the generation of Java components from QML as it can be "
-                        "enabled only for an AAR target.\n");
+                        "Warning: Skipping the generation of Java QtQuickView contents from QML "
+                        "as it can be enabled only for an AAR target.\n");
                 options->generateJavaQmlComponents = false;
             }
         }
@@ -1321,7 +1321,7 @@ bool readInputFile(Options *options)
         } else if (options->generateJavaQmlComponents) {
             fprintf(stderr,
                     "No qmldom binary defined in json file which is required when "
-                    "building with QT_ANDROID_GENERATE_JAVA_QML_COMPONENTS flag.\n");
+                    "building with QT_ANDROID_GENERATE_JAVA_QTQUICKVIEW_CONTENTS flag.\n");
             return false;
         }
     }
@@ -3708,7 +3708,7 @@ int generateJavaQmlComponents(const Options &options)
         if (moduleInfo.moduleName == libName) {
             fprintf(stderr,
                     "A QML module name (%s) cannot be the same as the target name when building "
-                    "with QT_ANDROID_GENERATE_JAVA_QML_COMPONENTS flag.\n",
+                    "with QT_ANDROID_GENERATE_JAVA_QTQUICKVIEW_CONTENTS flag.\n",
                     qPrintable(moduleInfo.moduleName));
             return false;
         }