From 12ccd9ec548c38bbe024121d55bb90650ba7d5a4 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 26 Oct 2021 18:33:09 +0300 Subject: [PATCH] Andriod: declare QLatin1String as char[] instead in AndroidManger Change-Id: I4f11950dcdfa0caddf02bf2b123ff78a9c01c062 Reviewed-by: hjk --- src/plugins/android/androidmanager.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index df77eb31a13..b1a1f15fdee 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -81,12 +81,12 @@ using namespace Android::Internal; namespace Android { -const QLatin1String AndroidManifestName("AndroidManifest.xml"); -const QLatin1String AndroidDeviceSn("AndroidDeviceSerialNumber"); -const QLatin1String AndroidDeviceAbis("AndroidDeviceAbis"); -const QLatin1String ApiLevelKey("AndroidVersion.ApiLevel"); -const char qtcSignature[] = "This file is generated by QtCreator to be read by androiddeployqt " - "and should not be modified by hand."; +const char AndroidManifestName[] = "AndroidManifest.xml"; +const char AndroidDeviceSn[] = "AndroidDeviceSerialNumber"; +const char AndroidDeviceAbis[] = "AndroidDeviceAbis"; +const char ApiLevelKey[] = "AndroidVersion.ApiLevel"; +const char qtcSignature[] = "This file is generated by QtCreator to be read by " + "androiddeployqt and should not be modified by hand."; static Q_LOGGING_CATEGORY(androidManagerLog, "qtc.android.androidManager", QtWarningMsg) @@ -132,7 +132,8 @@ QString AndroidManager::activityName(const Target *target) QDomDocument doc; if (!openManifest(target, doc)) 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")); }