feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Andriod: declare QLatin1String as char[] instead in AndroidManger

Browse Source 
Change-Id: I4f11950dcdfa0caddf02bf2b123ff78a9c01c062
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Assam Boudjelthia
2021-10-26 18:33:09 +03:00
parent a17170d027
commit 12ccd9ec54
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/android/androidmanager.cpp
View File

@@ -81,12 +81,12 @@ using namespace Android::Internal;
namespace Android { namespace Android {
const QLatin1String AndroidManifestName("AndroidManifest.xml"); const char AndroidManifestName[] = "AndroidManifest.xml";
const QLatin1String AndroidDeviceSn("AndroidDeviceSerialNumber"); const char AndroidDeviceSn[] = "AndroidDeviceSerialNumber";
const QLatin1String AndroidDeviceAbis("AndroidDeviceAbis"); const char AndroidDeviceAbis[] = "AndroidDeviceAbis";
const QLatin1String ApiLevelKey("AndroidVersion.ApiLevel"); const char ApiLevelKey[] = "AndroidVersion.ApiLevel";
const char qtcSignature[] = "This file is generated by QtCreator to be read by androiddeployqt " const char qtcSignature[] = "This file is generated by QtCreator to be read by "
"and should not be modified by hand."; "androiddeployqt and should not be modified by hand.";
static Q_LOGGING_CATEGORY(androidManagerLog, "qtc.android.androidManager", QtWarningMsg) static Q_LOGGING_CATEGORY(androidManagerLog, "qtc.android.androidManager", QtWarningMsg)
@@ -132,7 +132,8 @@ QString AndroidManager::activityName(const Target *target)
QDomDocument doc; QDomDocument doc;
if (!openManifest(target, doc)) if (!openManifest(target, doc))
return QString(); return QString();
QDomElement activityElem = doc.documentElement().firstChildElement(QLatin1String("application")).firstChildElement(QLatin1String("activity")); QDomElement activityElem = doc.documentElement().firstChildElement(
QLatin1String("application")).firstChildElement(QLatin1String("activity"));
return activityElem.attribute(QLatin1String("android:name")); return activityElem.attribute(QLatin1String("android:name"));
} }