diff --git a/src/plugins/qnx/blackberrycertificate.cpp b/src/plugins/qnx/blackberrycertificate.cpp index d442ad3679203ba31401867e3376cbdf70f13f83..5f4c84caea58e59716d5cfeb6d3bfa096e9b448b 100644 --- a/src/plugins/qnx/blackberrycertificate.cpp +++ b/src/plugins/qnx/blackberrycertificate.cpp @@ -117,7 +117,7 @@ QString BlackBerryCertificate::author() const QString BlackBerryCertificate::id() const { QString tmpId = fileName(); - return tmpId.replace(QLatin1String("/"), QLatin1String("-")); + return tmpId.replace(QLatin1Char('/'), QLatin1Char('-')); } void BlackBerryCertificate::storeFinished(int status) diff --git a/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp b/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp index cbe3e59ac64f5bf07f7e23f2951341e1cd1e810a..8728f11c07162597d96679e6069f8e60b1fdb0b9 100644 --- a/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp +++ b/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp @@ -185,7 +185,7 @@ void BlackBerryDebugTokenRequestDialog::expandPath() { const QString path = m_ui->debugTokenPath->path(); - if (path.isEmpty() || path.startsWith(QLatin1String("/"))) + if (path.isEmpty() || path.startsWith(QLatin1Char('/'))) return; const QFileInfo fileInfo(path); diff --git a/src/plugins/qnx/blackberrydeployinformation.cpp b/src/plugins/qnx/blackberrydeployinformation.cpp index 251cdc237243cf2d27fc2e404246d727a776539c..5698bd8893e01485febdece732543c1fb1909a1a 100644 --- a/src/plugins/qnx/blackberrydeployinformation.cpp +++ b/src/plugins/qnx/blackberrydeployinformation.cpp @@ -65,7 +65,7 @@ QString BarPackageDeployInformation::appDescriptorPath() const QString BarPackageDeployInformation::packagePath() const { if (userPackagePath.isEmpty()) - return buildDir + QLatin1String("/") + targetName + QLatin1String(".bar"); + return buildDir + QLatin1Char('/') + targetName + QLatin1String(".bar"); return userPackagePath; } diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp index 36299ac13aa58acf75b70a8f4465d4fa5813e4be..f923cc5cd07bbe79ee73cf62b6f5aa0ef1353d64 100644 --- a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp +++ b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp @@ -254,7 +254,7 @@ bool BlackBerryDeviceConfigurationWizardSshKeyPage::saveKeys(const QString &priv Utils::FileSaver pubSaver(publicKeyFile); // blackberry-connect requires an @ character to be included in the RSA comment - const QString atHost = QLatin1String("@") + QHostInfo::localHostName(); + const QString atHost = QLatin1Char('@') + QHostInfo::localHostName(); QByteArray pubKeyContent = m_sshKeysGenerator->keyGenerator()->publicKey(); pubKeyContent.append(atHost.toLocal8Bit()); diff --git a/src/plugins/qnx/blackberrysetupwizard.cpp b/src/plugins/qnx/blackberrysetupwizard.cpp index 6d29689e03f58cc086bc970c3a4c6d8b42dafdf3..2a5df8bb3269e967abe03d7a6f21d653e418cedb 100644 --- a/src/plugins/qnx/blackberrysetupwizard.cpp +++ b/src/plugins/qnx/blackberrysetupwizard.cpp @@ -409,7 +409,7 @@ void BlackBerrySetupWizard::generateSshKeys() Utils::FileSaver publicKeySaver(publicKeyPath()); // blackberry-connect requires an @ character to be included in the RSA comment - const QString atHost = QLatin1String("@") + QHostInfo::localHostName(); + const QString atHost = QLatin1Char('@') + QHostInfo::localHostName(); QByteArray publicKeyContent = m_keyGenerator->publicKey(); publicKeyContent.append(atHost.toLocal8Bit()); diff --git a/src/plugins/qnx/blackberrysetupwizardpages.cpp b/src/plugins/qnx/blackberrysetupwizardpages.cpp index cb7ab612717da117b0f13eb16a9df48a13ae47d9..bc823b206afe12e972a837acb25c80ef89325642 100644 --- a/src/plugins/qnx/blackberrysetupwizardpages.cpp +++ b/src/plugins/qnx/blackberrysetupwizardpages.cpp @@ -189,15 +189,15 @@ void BlackBerrySetupWizardKeysPage::initUi() connect(m_ui->linkLabel, SIGNAL(linkActivated(QString)), this, SLOT(showKeysMessage(QString))); - registerField(QLatin1String(PbdtPathField) + QLatin1String("*"), + registerField(QLatin1String(PbdtPathField) + QLatin1Char('*'), m_ui->pbdtPath, "path", SIGNAL(changed(QString))); - registerField(QLatin1String(RdkPathField) + QLatin1String("*"), + registerField(QLatin1String(RdkPathField) + QLatin1Char('*'), m_ui->rdkPath, "path", SIGNAL(changed(QString))); - registerField(QLatin1String(CsjPinField) + QLatin1String("*"), + registerField(QLatin1String(CsjPinField) + QLatin1Char('*'), m_ui->csjPin); - registerField(QLatin1String(PasswordField) + QLatin1String("*"), + registerField(QLatin1String(PasswordField) + QLatin1Char('*'), m_ui->password); - registerField(QLatin1String(Password2Field) + QLatin1String("*"), + registerField(QLatin1String(Password2Field) + QLatin1Char('*'), m_ui->password2); } @@ -263,8 +263,8 @@ BlackBerrySetupWizardDevicePage::BlackBerrySetupWizardDevicePage(QWidget *parent connect(m_ui->password, SIGNAL(textChanged(QString)), this, SIGNAL(completeChanged())); connect(m_ui->physicalDevice, SIGNAL(toggled(bool)), this, SIGNAL(completeChanged())); - registerField(QLatin1String(NameField) + QLatin1String("*"), m_ui->deviceName); - registerField(QLatin1String(IpAddressField) + QLatin1String("*"), m_ui->ipAddress); + registerField(QLatin1String(NameField) + QLatin1Char('*'), m_ui->deviceName); + registerField(QLatin1String(IpAddressField) + QLatin1Char('*'), m_ui->ipAddress); registerField(QLatin1String(PasswordField), m_ui->password); registerField(QLatin1String(PhysicalDeviceField), m_ui->physicalDevice); } diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp index 2e6495ee03f5ec74c9a826676542d96170d4304b..277bcfe6e1ff3bd853877b482279f4c123639877 100644 --- a/src/plugins/qnx/qnxrunconfiguration.cpp +++ b/src/plugins/qnx/qnxrunconfiguration.cpp @@ -68,7 +68,7 @@ QString QnxRunConfiguration::environmentPreparationCommand() const foreach (const QString &filePath, filesToSource) command += QString::fromLatin1("test -f %1 && . %1;").arg(filePath); if (!workingDirectory().isEmpty()) - command += QLatin1String("cd ") + workingDirectory() + QLatin1String(";"); + command += QLatin1String("cd ") + workingDirectory() + QLatin1Char(';'); if (!m_qtLibPath.isEmpty()) command += QLatin1String("LD_LIBRARY_PATH=") + m_qtLibPath + QLatin1String(":$LD_LIBRARY_PATH");