feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
Change-Id: I44e34b62d16e824939b75d02738f58fd8e3380a7
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-07-16 11:07:17 +02:00
committed by Daniel Teske
parent a6f3ec03f2
commit ec9809e657
8 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qnx/blackberryapplicationrunner.cpp
View File

@@ -124,7 +124,7 @@ void BlackBerryApplicationRunner::start()
args << QLatin1String("-launchApp"); args << QLatin1String("-launchApp");
if (m_debugMode) if (m_debugMode)
args << QLatin1String("-debugNative"); args << QLatin1String("-debugNative");
args << "-device" << m_deviceHost; args << QLatin1String("-device") << m_deviceHost;
if (!m_password.isEmpty()) if (!m_password.isEmpty())
args << QLatin1String("-password") << m_password; args << QLatin1String("-password") << m_password;
args << QDir::toNativeSeparators(m_barPackage); args << QDir::toNativeSeparators(m_barPackage);
@@ -304,7 +304,7 @@ void BlackBerryApplicationRunner::determineRunningState()
{ {
QStringList args; QStringList args;
args << QLatin1String("-isAppRunning"); args << QLatin1String("-isAppRunning");
args << "-device" << m_deviceHost; args << QLatin1String("-device") << m_deviceHost;
if (!m_password.isEmpty()) if (!m_password.isEmpty())
args << QLatin1String("-password") << m_password; args << QLatin1String("-password") << m_password;
args << m_barPackage; args << m_barPackage;
@@ -340,7 +340,7 @@ void BlackBerryApplicationRunner::readRunningStateStandardOutput()
void BlackBerryApplicationRunner::reset() void BlackBerryApplicationRunner::reset()
{ {
m_pid = -1; m_pid = -1;
m_appId = ""; m_appId.clear();
m_running = false; m_running = false;
m_stopping = false; m_stopping = false;

1
src/plugins/qnx/blackberrydeviceconfiguration.h
View File

@@ -45,6 +45,7 @@ namespace Internal {
class BlackBerryDeviceConfiguration : public RemoteLinux::LinuxDeviceConfiguration class BlackBerryDeviceConfiguration : public RemoteLinux::LinuxDeviceConfiguration
{ {
Q_DECLARE_TR_FUNCTIONS(BlackBerryDeviceConfiguration)
public: public:
typedef QSharedPointer<BlackBerryDeviceConfiguration> Ptr; typedef QSharedPointer<BlackBerryDeviceConfiguration> Ptr;
typedef QSharedPointer<const BlackBerryDeviceConfiguration> ConstPtr; typedef QSharedPointer<const BlackBerryDeviceConfiguration> ConstPtr;

2
src/plugins/qnx/blackberryqtversionfactory.cpp
View File

@@ -79,7 +79,7 @@ QtSupport::BaseQtVersion *BlackBerryQtVersionFactory::create(const Utils::FileNa
if (!fi.exists() || !fi.isExecutable() || !fi.isFile()) if (!fi.exists() || !fi.isExecutable() || !fi.isFile())
return 0; return 0;
if (evaluator->value(QLatin1String("CONFIG")).contains("blackberry")) { if (evaluator->value(QLatin1String("CONFIG")).contains(QLatin1String("blackberry"))) {
QString cpuDir = evaluator->value(QLatin1String("QNX_CPUDIR")); QString cpuDir = evaluator->value(QLatin1String("QNX_CPUDIR"));
return new BlackBerryQtVersion(QnxUtils::cpudirToArch(cpuDir), qmakePath, return new BlackBerryQtVersion(QnxUtils::cpudirToArch(cpuDir), qmakePath,
isAutoDetected, autoDetectionSource); isAutoDetected, autoDetectionSource);

2
src/plugins/qnx/blackberryrunconfigurationfactory.cpp
View File

@@ -118,7 +118,7 @@ bool BlackBerryRunConfigurationFactory::canRestore(ProjectExplorer::Target *pare
if (!canHandle(parent)) if (!canHandle(parent))
return false; 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( ProjectExplorer::RunConfiguration *BlackBerryRunConfigurationFactory::restore(

2
src/plugins/qnx/blackberryruncontrol.cpp
View File

@@ -83,7 +83,7 @@ bool BlackBerryRunControl::isRunning() const
QIcon BlackBerryRunControl::icon() 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) void BlackBerryRunControl::handleStartFailed(const QString &message)

2
src/plugins/qnx/qnx.pro
View File

@@ -117,7 +117,7 @@ FORMS += \
qnxbaseqtconfigwidget.ui \ qnxbaseqtconfigwidget.ui \
bardescriptorfileimagewizardpage.ui bardescriptorfileimagewizardpage.ui
DEFINES += QT_NO_CAST_TO_ASCII DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
RESOURCES += \ RESOURCES += \
qnx.qrc qnx.qrc

1
src/plugins/qnx/qnxdeviceconfiguration.h
View File

@@ -41,6 +41,7 @@ namespace Internal {
class QnxDeviceConfiguration : public RemoteLinux::LinuxDeviceConfiguration class QnxDeviceConfiguration : public RemoteLinux::LinuxDeviceConfiguration
{ {
Q_DECLARE_TR_FUNCTIONS(QnxDeviceConfiguration)
public: public:
typedef QSharedPointer<QnxDeviceConfiguration> Ptr; typedef QSharedPointer<QnxDeviceConfiguration> Ptr;
typedef QSharedPointer<const QnxDeviceConfiguration> ConstPtr; typedef QSharedPointer<const QnxDeviceConfiguration> ConstPtr;

2
src/plugins/qnx/qnxrunconfigurationfactory.cpp
View File

@@ -116,7 +116,7 @@ bool QnxRunConfigurationFactory::canRestore(ProjectExplorer::Target *parent, con
if (!canHandle(parent)) if (!canHandle(parent))
return false; 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) ProjectExplorer::RunConfiguration *QnxRunConfigurationFactory::restore(ProjectExplorer::Target *parent, const QVariantMap &map)