From 73d60a58137d12dbe95c58d39a71c028f1dfff88 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Mon, 26 Nov 2012 14:41:39 +0200
Subject: [PATCH] RemoteLinux: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I10541e999d6210caf6b88ecb5c1010e831b2f4d4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
src/plugins/remotelinux/embeddedlinuxqtversion.cpp | 2 +-
.../genericlinuxdeviceconfigurationwidget.cpp | 2 +-
src/plugins/remotelinux/linuxdevice.cpp | 2 +-
.../remotelinux/publickeydeploymentdialog.cpp | 2 +-
src/plugins/remotelinux/remotelinux.pro | 5 +++--
src/plugins/remotelinux/remotelinux.qbs | 2 ++
.../remotelinux/remotelinuxenvironmentreader.cpp | 2 +-
src/plugins/remotelinux/remotelinuxruncontrol.cpp | 2 +-
src/plugins/remotelinux/tarpackagecreationstep.cpp | 14 +++++++-------
9 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp
index 8192296a693..9986251ec38 100644
--- a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp
+++ b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp
@@ -56,7 +56,7 @@ EmbeddedLinuxQtVersion *EmbeddedLinuxQtVersion::clone() const
QString EmbeddedLinuxQtVersion::type() const
{
- return RemoteLinux::Constants::EMBEDDED_LINUX_QT;
+ return QLatin1String(RemoteLinux::Constants::EMBEDDED_LINUX_QT);
}
QList<ProjectExplorer::Abi> EmbeddedLinuxQtVersion::detectQtAbis() const
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
index bda704da926..53738d5def4 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
@@ -173,7 +173,7 @@ void GenericLinuxDeviceConfigurationWidget::initGui()
m_ui->machineTypeValueLabel->setText(tr("Physical Device"));
else
m_ui->machineTypeValueLabel->setText(tr("Emulator"));
- m_ui->portsWarningLabel->setPixmap(QPixmap(":/projectexplorer/images/compile_error.png"));
+ m_ui->portsWarningLabel->setPixmap(QPixmap(QLatin1String(":/projectexplorer/images/compile_error.png")));
m_ui->portsWarningLabel->setToolTip(QLatin1String("<font color=\"red\">")
+ tr("You will need at least one port.") + QLatin1String("</font>"));
m_ui->keyFileLineEdit->setExpectedKind(PathChooser::File);
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index 5867036cc74..39f1457fb88 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -71,7 +71,7 @@ private:
"cat $dir/stat;"
"readlink $dir/exe;"
"printf '%1''%2';"
- "done").arg(Delimiter0).arg(Delimiter1);
+ "done").arg(QLatin1String(Delimiter0)).arg(QLatin1String(Delimiter1));
}
QList<DeviceProcess> buildProcessList(const QString &listProcessesReply) const
diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
index 0196530efd0..42a2ceb3dea 100644
--- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp
+++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
@@ -109,7 +109,7 @@ void PublicKeyDeploymentDialog::handleDeploymentFinished(const QString &errorMsg
buttonText = errorMsg;
textColor = "red";
}
- setLabelText(QString::fromLatin1("<font color=\"%1\">%2</font>").arg(textColor, buttonText));
+ setLabelText(QString::fromLatin1("<font color=\"%1\">%2</font>").arg(QLatin1String(textColor), buttonText));
setCancelButtonText(tr("Close"));
}
diff --git a/src/plugins/remotelinux/remotelinux.pro b/src/plugins/remotelinux/remotelinux.pro
index aaa4162a03d..e26ccd9f032 100644
--- a/src/plugins/remotelinux/remotelinux.pro
+++ b/src/plugins/remotelinux/remotelinux.pro
@@ -100,5 +100,6 @@ FORMS += \
RESOURCES += remotelinux.qrc
-DEFINES += QT_NO_CAST_TO_ASCII
-DEFINES += REMOTELINUX_LIBRARY
+DEFINES += \
+ REMOTELINUX_LIBRARY \
+ QT_NO_CAST_FROM_ASCII
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index 8246f6b39dd..f98e7ba9506 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -5,12 +5,14 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "RemoteLinux"
+ Depends { name: "cpp" }
Depends { name: "Qt.widgets" }
Depends { name: "Core" }
Depends { name: "Debugger" }
Depends { name: "ProjectExplorer" }
Depends { name: "QtSupport" }
Depends { name: "QtcSsh" }
+ cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
files: [
"abstractpackagingstep.cpp",
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
index 561b5b9bde5..32dbfaad955 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
@@ -111,7 +111,7 @@ void RemoteLinuxEnvironmentReader::remoteProcessFinished(int exitCode)
} else {
QString errorMsg = tr("Error running remote process: %1")
.arg(m_remoteProcessRunner->processErrorString());
- QString remoteStderr = m_remoteProcessRunner->readAllStandardError();
+ QString remoteStderr = QString::fromUtf8(m_remoteProcessRunner->readAllStandardError());
if (!remoteStderr.isEmpty())
errorMsg += tr("\nRemote stderr was: '%1'").arg(remoteStderr);
emit error(errorMsg);
diff --git a/src/plugins/remotelinux/remotelinuxruncontrol.cpp b/src/plugins/remotelinux/remotelinuxruncontrol.cpp
index 71a9f386c55..85e9cfe29d7 100644
--- a/src/plugins/remotelinux/remotelinuxruncontrol.cpp
+++ b/src/plugins/remotelinux/remotelinuxruncontrol.cpp
@@ -127,7 +127,7 @@ bool RemoteLinuxRunControl::isRunning() const
QIcon RemoteLinuxRunControl::icon() const
{
- return QIcon(ProjectExplorer::Constants::ICON_RUN_SMALL);
+ return QIcon(QLatin1String(ProjectExplorer::Constants::ICON_RUN_SMALL));
}
void RemoteLinuxRunControl::setApplicationRunnerPreRunAction(DeviceApplicationHelperAction *action)
diff --git a/src/plugins/remotelinux/tarpackagecreationstep.cpp b/src/plugins/remotelinux/tarpackagecreationstep.cpp
index 3f6fff6c195..1a30edab5e0 100644
--- a/src/plugins/remotelinux/tarpackagecreationstep.cpp
+++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp
@@ -231,7 +231,7 @@ bool TarPackageCreationStep::writeHeader(QFile &tarFile, const QFileInfo &fileIn
const int maxFilePathLength = sizeof header.fileNamePrefix + sizeof header.fileName;
if (filePath.count() > maxFilePathLength) {
raiseError(tr("Cannot add file '%1' to tar-archive: path too long.")
- .arg(QDir::toNativeSeparators(filePath)));
+ .arg(QDir::toNativeSeparators(remoteFilePath)));
return false;
}
@@ -249,19 +249,19 @@ bool TarPackageCreationStep::writeHeader(QFile &tarFile, const QFileInfo &fileIn
| (04 * fileInfo.permission(QFile::ReadOther))
| (02 * fileInfo.permission(QFile::WriteOther))
| (01 * fileInfo.permission(QFile::ExeOther));
- const QByteArray permissionString = QString("%1").arg(permissions,
+ const QByteArray permissionString = QString::fromLatin1("%1").arg(permissions,
sizeof header.fileMode - 1, 8, QLatin1Char('0')).toLatin1();
std::memcpy(&header.fileMode, permissionString.data(), permissionString.length());
- const QByteArray uidString = QString("%1").arg(fileInfo.ownerId(),
+ const QByteArray uidString = QString::fromLatin1("%1").arg(fileInfo.ownerId(),
sizeof header.uid - 1, 8, QLatin1Char('0')).toLatin1();
std::memcpy(&header.uid, uidString.data(), uidString.length());
- const QByteArray gidString = QString("%1").arg(fileInfo.groupId(),
+ const QByteArray gidString = QString::fromLatin1("%1").arg(fileInfo.groupId(),
sizeof header.gid - 1, 8, QLatin1Char('0')).toLatin1();
std::memcpy(&header.gid, gidString.data(), gidString.length());
- const QByteArray sizeString = QString("%1").arg(fileInfo.size(),
+ const QByteArray sizeString = QString::fromLatin1("%1").arg(fileInfo.size(),
sizeof header.length - 1, 8, QLatin1Char('0')).toLatin1();
std::memcpy(&header.length, sizeString.data(), sizeString.length());
- const QByteArray mtimeString = QString("%1").arg(fileInfo.lastModified().toTime_t(),
+ const QByteArray mtimeString = QString::fromLatin1("%1").arg(fileInfo.lastModified().toTime_t(),
sizeof header.mtime - 1, 8, QLatin1Char('0')).toLatin1();
std::memcpy(&header.mtime, mtimeString.data(), mtimeString.length());
if (fileInfo.isDir())
@@ -276,7 +276,7 @@ bool TarPackageCreationStep::writeHeader(QFile &tarFile, const QFileInfo &fileIn
quint64 checksum = 0;
for (size_t i = 0; i < sizeof header; ++i)
checksum += reinterpret_cast<char *>(&header)[i];
- const QByteArray checksumString = QString("%1").arg(checksum,
+ const QByteArray checksumString = QString::fromLatin1("%1").arg(checksum,
sizeof header.chksum - 1, 8, QLatin1Char('0')).toLatin1();
std::memcpy(&header.chksum, checksumString.data(), checksumString.length());
header.chksum[sizeof header.chksum-1] = 0;
--
GitLab