From 86e34dfcddf6ffd24780a50b3b4c66b9f6726b70 Mon Sep 17 00:00:00 2001 From: Soheil Armin Date: Thu, 11 Jul 2024 10:45:34 +0300 Subject: [PATCH] Android: Reflect renaming of QtQmlComponent to QtQuickViewContent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pick-to: 6.8 Task-number: QTBUG-126976 Task-number: QTBUG-127083 Change-Id: I001a095c2844c725c85113c03c8640f507c8f11e Reviewed-by: Tinja Paavoseppä --- src/tools/androiddeployqt/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index c91f9297005..ec19cbb9317 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -3566,7 +3566,7 @@ int generateJavaQmlComponents(const Options &options) stream << "/* This file is autogenerated by androiddeployqt. Do not edit */\n\n" << "package %1;\n\n"_L1.arg(javaPackage) << "import org.qtproject.qt.android.QtSignalListener;\n" - << "import org.qtproject.qt.android.QtQmlComponent;\n\n"; + << "import org.qtproject.qt.android.QtQuickViewContent;\n\n"; }; const auto beginLibraryBlock = [](QTextStream &stream, const QString &libName) { @@ -3586,7 +3586,7 @@ int generateJavaQmlComponents(const Options &options) const QString indent(indentWidth, u' '); stream << indent - << "public final static class %1 extends QtQmlComponent {\n"_L1 + << "public final static class %1 extends QtQuickViewContent {\n"_L1 .arg(componentInfo.name) << indent << " @Override public String getLibraryName() {\n"_L1 << indent << " return \"%1\";\n"_L1.arg(libName) @@ -3870,7 +3870,7 @@ int main(int argc, char *argv[]) } if (Q_UNLIKELY(options.timing)) { - fprintf(stdout, "[TIMING] %lld ns: Generate Java QtQmlComponents.\n", + fprintf(stdout, "[TIMING] %lld ns: Generate Java QtQuickViewContents.\n", options.timer.nsecsElapsed()); }