1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Reflect renaming of QtQmlComponent to QtQuickViewContent

Browse Source 
Task-number: QTBUG-126976
Task-number: QTBUG-127083
Change-Id: I001a095c2844c725c85113c03c8640f507c8f11e
Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
(cherry picked from commit 86e34dfcddf6ffd24780a50b3b4c66b9f6726b70)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Soheil Armin 2024-07-11 10:45:34 +03:00 committed by Qt Cherry-pick Bot
parent 4a3abb02d6
commit 820098c966
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/androiddeployqt/main.cpp
View File

@ -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());
}