Skip to content

Commit 86e34df

Browse files
committed
Android: Reflect renaming of QtQmlComponent to QtQuickViewContent
Pick-to: 6.8 Task-number: QTBUG-126976 Task-number: QTBUG-127083 Change-Id: I001a095c2844c725c85113c03c8640f507c8f11e Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
1 parent d6ddda8 commit 86e34df

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/tools/androiddeployqt/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3566,7 +3566,7 @@ int generateJavaQmlComponents(const Options &options)
35663566
stream << "/* This file is autogenerated by androiddeployqt. Do not edit */\n\n"
35673567
<< "package %1;\n\n"_L1.arg(javaPackage)
35683568
<< "import org.qtproject.qt.android.QtSignalListener;\n"
3569-
<< "import org.qtproject.qt.android.QtQmlComponent;\n\n";
3569+
<< "import org.qtproject.qt.android.QtQuickViewContent;\n\n";
35703570
};
35713571

35723572
const auto beginLibraryBlock = [](QTextStream &stream, const QString &libName) {
@@ -3586,7 +3586,7 @@ int generateJavaQmlComponents(const Options &options)
35863586
const QString indent(indentWidth, u' ');
35873587

35883588
stream << indent
3589-
<< "public final static class %1 extends QtQmlComponent {\n"_L1
3589+
<< "public final static class %1 extends QtQuickViewContent {\n"_L1
35903590
.arg(componentInfo.name)
35913591
<< indent << " @Override public String getLibraryName() {\n"_L1
35923592
<< indent << " return \"%1\";\n"_L1.arg(libName)
@@ -3870,7 +3870,7 @@ int main(int argc, char *argv[])
38703870
}
38713871

38723872
if (Q_UNLIKELY(options.timing)) {
3873-
fprintf(stdout, "[TIMING] %lld ns: Generate Java QtQmlComponents.\n",
3873+
fprintf(stdout, "[TIMING] %lld ns: Generate Java QtQuickViewContents.\n",
38743874
options.timer.nsecsElapsed());
38753875
}
38763876

0 commit comments

Comments
 (0)