diff --git a/QGCCommon.pri b/QGCCommon.pri
index e23a9e4839af67398139a9d10306d6d7baaffc02..1e1f118c897006c3e9a4ec0ac412d62da910c4f5 100644
--- a/QGCCommon.pri
+++ b/QGCCommon.pri
@@ -57,7 +57,6 @@ linux {
-Wno-parentheses-equality # android gstreamer header files
QMAKE_CFLAGS_WARN_ON += \
-Wno-unused-command-line-argument # from somewhere in Qt generated build files
- QMAKE_LINK += -nostdlib++ # Hack fix?: https://forum.qt.io/topic/103713/error-cannot-find-lc-qt-5-12-android
target.path = $$DESTDIR
equals(ANDROID_TARGET_ARCH, armeabi-v7a) {
DEFINES += __androidArm32__
@@ -232,13 +231,6 @@ CONFIG(debug, debug|release) {
SOURCE_DIR = $$IN_PWD
-!iOSBuild {
- OBJECTS_DIR = $${OUT_PWD}/obj
- MOC_DIR = $${OUT_PWD}/moc
- UI_DIR = $${OUT_PWD}/ui
- RCC_DIR = $${OUT_PWD}/rcc
-}
-
LANGUAGE = C++
LOCATION_PLUGIN_DESTDIR = $${OUT_PWD}/src/QtLocationPlugin
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 46bebf0fa6d046211ef22bf89637b85d5e2cd5f4..93bb77f732516f80d58bc82d5a725311b1d42c89 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -7,11 +7,10 @@
-
-
+
+
-
@@ -36,13 +35,11 @@
-
-
-
+
@@ -63,20 +60,20 @@
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/src/AnalyzeView/ULogParser.cc b/src/AnalyzeView/ULogParser.cc
index f3a384c285ca8e0a5cd3e4bd1db6d4ff110d900f..21309fb65e19e851e94c74b1d1a46938bff9efc9 100644
--- a/src/AnalyzeView/ULogParser.cc
+++ b/src/AnalyzeView/ULogParser.cc
@@ -14,25 +14,25 @@ ULogParser::~ULogParser()
int ULogParser::sizeOfType(QString& typeName)
{
- if (typeName == QLatin1Literal("int8_t") || typeName == QLatin1Literal("uint8_t")) {
+ if (typeName == QLatin1String("int8_t") || typeName == QLatin1String("uint8_t")) {
return 1;
- } else if (typeName == QLatin1Literal("int16_t") || typeName == QLatin1Literal("uint16_t")) {
+ } else if (typeName == QLatin1String("int16_t") || typeName == QLatin1String("uint16_t")) {
return 2;
- } else if (typeName == QLatin1Literal("int32_t") || typeName == QLatin1Literal("uint32_t")) {
+ } else if (typeName == QLatin1String("int32_t") || typeName == QLatin1String("uint32_t")) {
return 4;
- } else if (typeName == QLatin1Literal("int64_t") || typeName == QLatin1Literal("uint64_t")) {
+ } else if (typeName == QLatin1String("int64_t") || typeName == QLatin1String("uint64_t")) {
return 8;
- } else if (typeName == QLatin1Literal("float")) {
+ } else if (typeName == QLatin1String("float")) {
return 4;
- } else if (typeName == QLatin1Literal("double")) {
+ } else if (typeName == QLatin1String("double")) {
return 8;
- } else if (typeName == QLatin1Literal("char") || typeName == QLatin1Literal("bool")) {
+ } else if (typeName == QLatin1String("char") || typeName == QLatin1String("bool")) {
return 1;
}
@@ -74,7 +74,7 @@ bool ULogParser::parseFieldFormat(QString& fields)
QString typeNameFull = fields.mid(prevFieldEnd, spacePos - prevFieldEnd);
QString fieldName = fields.mid(spacePos + 1, fieldEnd - spacePos - 1);
- if (!fieldName.contains(QLatin1Literal("_padding"))) {
+ if (!fieldName.contains(QLatin1String("_padding"))) {
_cameraCaptureOffsets.insert(fieldName, offset);
offset += sizeOfFullType(typeNameFull);
}
@@ -117,7 +117,7 @@ bool ULogParser::getTagsFromLog(QByteArray& log, QListdownload(json[QLatin1Literal("download_url")].toString());
+ downloader->download(json[QLatin1String("download_url")].toString());
} else {
qgcApp()->showAppMessage(tr("Param file github json download failed: %1").arg(errorMsg));
qgcApp()->restoreOverrideCursor();