diff --git a/src/plugins/android/android.pro b/src/plugins/android/android.pro index 7add49bad7f..94e3fd054c5 100644 --- a/src/plugins/android/android.pro +++ b/src/plugins/android/android.pro @@ -76,5 +76,5 @@ FORMS += \ androidcreatekeystorecertificate.ui RESOURCES = android.qrc -DEFINES += QT_NO_CAST_TO_ASCII +DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII DEFINES += ANDROID_LIBRARY diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index f82eeadf938..0871e015f24 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -233,7 +233,7 @@ QStringList AndroidConfigurations::sdkTargets(int minApiLevel) const return targets; } while (proc.canReadLine()) { - QString line = proc.readLine().trimmed(); + const QString line = QString::fromLocal8Bit(proc.readLine().trimmed()); int index = line.indexOf(QLatin1String("\"android-")); if (index == -1) continue; diff --git a/src/plugins/android/androiddeployconfiguration.cpp b/src/plugins/android/androiddeployconfiguration.cpp index cb198d09a26..24e6b4398ff 100644 --- a/src/plugins/android/androiddeployconfiguration.cpp +++ b/src/plugins/android/androiddeployconfiguration.cpp @@ -143,7 +143,7 @@ QList AndroidDeployConfigurationFactory::availableCreationIds(ProjectE QString AndroidDeployConfigurationFactory::displayNameForId(const Core::Id id) const { - if (id.toString().startsWith(ANDROID_DC_PREFIX)) + if (id.toString().startsWith(QLatin1String(ANDROID_DC_PREFIX))) return tr("Deploy on Android"); return QString(); } diff --git a/src/plugins/android/androiddevicefactory.h b/src/plugins/android/androiddevicefactory.h index 499663b8943..2e17eb9ed52 100644 --- a/src/plugins/android/androiddevicefactory.h +++ b/src/plugins/android/androiddevicefactory.h @@ -40,6 +40,7 @@ namespace Internal { class AndroidDeviceFactory : public ProjectExplorer::IDeviceFactory { + Q_OBJECT public: AndroidDeviceFactory(); diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index d0b88155d3f..8465a0e12c9 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -95,7 +95,7 @@ bool AndroidManager::supportsAndroid(ProjectExplorer::Target *target) if (!qobject_cast(target->project())) return false; QtSupport::BaseQtVersion *version = QtSupport::QtProfileInformation::qtVersion(target->profile()); - return version && version->platformName() == QtSupport::Constants::ANDROID_PLATFORM; + return version && version->platformName() == QLatin1String(QtSupport::Constants::ANDROID_PLATFORM); } QString AndroidManager::packageName(ProjectExplorer::Target *target) @@ -389,7 +389,7 @@ QString AndroidManager::targetApplicationPath(ProjectExplorer::Target *target) && proFile->targetInformation().target.endsWith(QLatin1String(".so"))) { if (proFile->targetInformation().target.mid(3, proFile->targetInformation().target.lastIndexOf(QLatin1Char('.')) - 3) == selectedApp) - return proFile->targetInformation().buildDir + QLatin1String("/") + proFile->targetInformation().target; + return proFile->targetInformation().buildDir + QLatin1Char('/') + proFile->targetInformation().target; } else { if (proFile->targetInformation().target == selectedApp) return proFile->targetInformation().buildDir + QLatin1String("/lib") + proFile->targetInformation().target + QLatin1String(".so"); @@ -437,9 +437,9 @@ bool AndroidManager::createAndroidTemplatesIfNecessary(ProjectExplorer::Target * } Utils::FileName src = androidPath; - src.appendPath("src"); + src.appendPath(QLatin1String("src")); Utils::FileName res = androidPath; - res.appendPath("res"); + res.appendPath(QLatin1String("res")); if (!forceUpdate && androidPath.toFileInfo().exists() && manifestPath(target).toFileInfo().exists() diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp index 4b8c0087997..a2dc33b65b3 100644 --- a/src/plugins/android/androidpackagecreationstep.cpp +++ b/src/plugins/android/androidpackagecreationstep.cpp @@ -85,7 +85,7 @@ public: QPair item; while (from > -1) { from += 11;// strlen(AliasString); - const int eol = rowCertificates.indexOf(QLatin1String("\n"), from); + const int eol = rowCertificates.indexOf(QLatin1Char('\n'), from); item.first = rowCertificates.mid(from, eol - from).trimmed(); const int eoc = rowCertificates.indexOf(CertificateSeparator, eol); item.second = rowCertificates.mid(eol + 1, eoc - eol - 2).trimmed(); @@ -433,7 +433,7 @@ bool AndroidPackageCreationStep::createPackage() return false; } - keyPass += "\n"; + keyPass += '\n'; buildProc->write(keyPass); buildProc->waitForBytesWritten(); buildProc->waitForFinished();