Commit ec9809e6 authored by Friedemann Kleint's avatar Friedemann Kleint Committed by Daniel Teske
Browse files

Fix tr() error in QNX plugin, use QT_NO_CAST_FROM_ASCII.



Change-Id: I44e34b62d16e824939b75d02738f58fd8e3380a7
Reviewed-by: default avatarTobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent a6f3ec03
......@@ -124,7 +124,7 @@ void BlackBerryApplicationRunner::start()
args << QLatin1String("-launchApp");
if (m_debugMode)
args << QLatin1String("-debugNative");
args << "-device" << m_deviceHost;
args << QLatin1String("-device") << m_deviceHost;
if (!m_password.isEmpty())
args << QLatin1String("-password") << m_password;
args << QDir::toNativeSeparators(m_barPackage);
......@@ -304,7 +304,7 @@ void BlackBerryApplicationRunner::determineRunningState()
{
QStringList args;
args << QLatin1String("-isAppRunning");
args << "-device" << m_deviceHost;
args << QLatin1String("-device") << m_deviceHost;
if (!m_password.isEmpty())
args << QLatin1String("-password") << m_password;
args << m_barPackage;
......@@ -340,7 +340,7 @@ void BlackBerryApplicationRunner::readRunningStateStandardOutput()
void BlackBerryApplicationRunner::reset()
{
m_pid = -1;
m_appId = "";
m_appId.clear();
m_running = false;
m_stopping = false;
......
......@@ -45,6 +45,7 @@ namespace Internal {
class BlackBerryDeviceConfiguration : public RemoteLinux::LinuxDeviceConfiguration
{
Q_DECLARE_TR_FUNCTIONS(BlackBerryDeviceConfiguration)
public:
typedef QSharedPointer<BlackBerryDeviceConfiguration> Ptr;
typedef QSharedPointer<const BlackBerryDeviceConfiguration> ConstPtr;
......
......@@ -79,7 +79,7 @@ QtSupport::BaseQtVersion *BlackBerryQtVersionFactory::create(const Utils::FileNa
if (!fi.exists() || !fi.isExecutable() || !fi.isFile())
return 0;
if (evaluator->value(QLatin1String("CONFIG")).contains("blackberry")) {
if (evaluator->value(QLatin1String("CONFIG")).contains(QLatin1String("blackberry"))) {
QString cpuDir = evaluator->value(QLatin1String("QNX_CPUDIR"));
return new BlackBerryQtVersion(QnxUtils::cpudirToArch(cpuDir), qmakePath,
isAutoDetected, autoDetectionSource);
......
......@@ -118,7 +118,7 @@ bool BlackBerryRunConfigurationFactory::canRestore(ProjectExplorer::Target *pare
if (!canHandle(parent))
return false;
return ProjectExplorer::idFromMap(map).toString().startsWith(Constants::QNX_BB_RUNCONFIGURATION_PREFIX);
return ProjectExplorer::idFromMap(map).toString().startsWith(QLatin1String(Constants::QNX_BB_RUNCONFIGURATION_PREFIX));
}
ProjectExplorer::RunConfiguration *BlackBerryRunConfigurationFactory::restore(
......
......@@ -83,7 +83,7 @@ bool BlackBerryRunControl::isRunning() const
QIcon BlackBerryRunControl::icon() const
{
return QIcon(ProjectExplorer::Constants::ICON_RUN_SMALL);
return QIcon(QLatin1String(ProjectExplorer::Constants::ICON_RUN_SMALL));
}
void BlackBerryRunControl::handleStartFailed(const QString &message)
......
......@@ -117,7 +117,7 @@ FORMS += \
qnxbaseqtconfigwidget.ui \
bardescriptorfileimagewizardpage.ui
DEFINES += QT_NO_CAST_TO_ASCII
DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
RESOURCES += \
qnx.qrc
......@@ -41,6 +41,7 @@ namespace Internal {
class QnxDeviceConfiguration : public RemoteLinux::LinuxDeviceConfiguration
{
Q_DECLARE_TR_FUNCTIONS(QnxDeviceConfiguration)
public:
typedef QSharedPointer<QnxDeviceConfiguration> Ptr;
typedef QSharedPointer<const QnxDeviceConfiguration> ConstPtr;
......
......@@ -116,7 +116,7 @@ bool QnxRunConfigurationFactory::canRestore(ProjectExplorer::Target *parent, con
if (!canHandle(parent))
return false;
return ProjectExplorer::idFromMap(map).toString().startsWith(Constants::QNX_QNX_RUNCONFIGURATION_PREFIX);
return ProjectExplorer::idFromMap(map).toString().startsWith(QLatin1String(Constants::QNX_QNX_RUNCONFIGURATION_PREFIX));
}
ProjectExplorer::RunConfiguration *QnxRunConfigurationFactory::restore(ProjectExplorer::Target *parent, const QVariantMap &map)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment