diff --git a/src/plugins/android/androiderrormessage.cpp b/src/plugins/android/androiderrormessage.cpp
index 86016c463589ef478c6263b716a3d17ca4375667..cbbd06b21af11aea20cf1b5bd09b834f2be83ed5 100644
--- a/src/plugins/android/androiderrormessage.cpp
+++ b/src/plugins/android/androiderrormessage.cpp
@@ -39,34 +39,34 @@ QString AndroidErrorMessage::getMessage(ErrorCode errorCode, const QVariantList
Q_UNUSED(parameters);
switch (errorCode) {
case SDKInstallationError:
- return QObject::tr("Android: SDK installation error 0x%1").arg(errorCode, 0, 16);
+ return tr("Android: SDK installation error 0x%1").arg(errorCode, 0, 16);
case NDKInstallationError:
- return QObject::tr("Android: NDK installation error 0x%1").arg(errorCode, 0, 16);
+ return tr("Android: NDK installation error 0x%1").arg(errorCode, 0, 16);
case JavaInstallationError:
- return QObject::tr("Android: Java installation error 0x%1").arg(errorCode, 0, 16);
+ return tr("Android: Java installation error 0x%1").arg(errorCode, 0, 16);
case AntInstallationError:
- return QObject::tr("Android: ant installation error 0x%1").arg(errorCode, 0, 16);
+ return tr("Android: ant installation error 0x%1").arg(errorCode, 0, 16);
case AdbInstallationError:
- return QObject::tr("Android: adb installation error 0x%1").arg(errorCode, 0, 16);
+ return tr("Android: adb installation error 0x%1").arg(errorCode, 0, 16);
case DeviceConnectionError:
- return QObject::tr("Android: Device connection error 0x%1").arg(errorCode, 0, 16);
+ return tr("Android: Device connection error 0x%1").arg(errorCode, 0, 16);
case DevicePermissionError:
- return QObject::tr("Android: Device permission error 0x%1").arg(errorCode, 0, 16);
+ return tr("Android: Device permission error 0x%1").arg(errorCode, 0, 16);
case DeviceAuthorizationError:
- return QObject::tr("Android: Device authorization error 0x%1").arg(errorCode, 0, 16);
+ return tr("Android: Device authorization error 0x%1").arg(errorCode, 0, 16);
case DeviceAPILevelError:
- return QObject::tr("Android: Device API level not supported: error 0x%1").arg(errorCode, 0, 16);
+ return tr("Android: Device API level not supported: error 0x%1").arg(errorCode, 0, 16);
default:
- return QObject::tr("Android: Unknown error 0x%1").arg(errorCode, 0, 16);
+ return tr("Android: Unknown error 0x%1").arg(errorCode, 0, 16);
}
}
diff --git a/src/plugins/android/androiderrormessage.h b/src/plugins/android/androiderrormessage.h
index 0e061389a34d17180144b227cb7c4dd3f714732c..fc7cf9be118a02bff8ee22a07907541014e648c1 100644
--- a/src/plugins/android/androiderrormessage.h
+++ b/src/plugins/android/androiderrormessage.h
@@ -31,12 +31,14 @@
#define ANDROIDERRORMESSAGE_H
#include <QVariantList>
+#include <QCoreApplication>
namespace Android {
namespace Internal {
class AndroidErrorMessage
{
+ Q_DECLARE_TR_FUNCTIONS(Android::Internal::AndroidErrorMessage)
public:
enum ErrorCode {
UnknownError = 0x3000,
diff --git a/src/plugins/qnx/blackberryconfiguration.cpp b/src/plugins/qnx/blackberryconfiguration.cpp
index 401094064774acf1b62cf4477b9246835356a778..189bc7d192c2f512ba54d8241f8da3a45c954ba5 100644
--- a/src/plugins/qnx/blackberryconfiguration.cpp
+++ b/src/plugins/qnx/blackberryconfiguration.cpp
@@ -200,16 +200,16 @@ BaseQtVersion *BlackBerryConfiguration::createQtVersion(const FileName &qmakePat
BaseQtVersion *version = QtVersionManager::qtVersionForQMakeBinary(qmakePath);
if (version) {
if (!m_isAutoDetected)
- QMessageBox::warning(0, QObject::tr("Qt Version Already Known"),
- QObject::tr("This Qt version was already registered."), QMessageBox::Ok);
+ QMessageBox::warning(0, tr("Qt Version Already Known"),
+ tr("This Qt version was already registered."), QMessageBox::Ok);
return version;
}
version = new BlackBerryQtVersion(QnxUtils::cpudirToArch(cpuDir), qmakePath, m_isAutoDetected, QString(), m_ndkEnvFile.toString());
if (!version) {
if (!m_isAutoDetected)
- QMessageBox::warning(0, QObject::tr("Invalid Qt Version"),
- QObject::tr("Unable to add BlackBerry Qt version."), QMessageBox::Ok);
+ QMessageBox::warning(0, tr("Invalid Qt Version"),
+ tr("Unable to add BlackBerry Qt version."), QMessageBox::Ok);
return 0;
}
@@ -225,8 +225,8 @@ GccToolChain *BlackBerryConfiguration::createGccToolChain()
foreach (ToolChain *tc, ToolChainManager::toolChains()) {
if (tc->compilerCommand() == m_gccCompiler) {
if (!m_isAutoDetected)
- QMessageBox::warning(0, QObject::tr("Compiler Already Known"),
- QObject::tr("This compiler was already registered."), QMessageBox::Ok);
+ QMessageBox::warning(0, tr("Compiler Already Known"),
+ tr("This compiler was already registered."), QMessageBox::Ok);
return dynamic_cast<GccToolChain *>(tc);
}
}
@@ -252,8 +252,8 @@ Kit *BlackBerryConfiguration::createKit(QnxArchitecture arch, BaseQtVersion *qtV
&& Debugger::DebuggerKitInformation::debuggerCommand(kit) == m_simulatorDebuger)
|| (arch == ArmLeV7 && Debugger::DebuggerKitInformation::debuggerCommand(kit) == m_deviceDebuger)) {
if (!m_isAutoDetected)
- QMessageBox::warning(0, QObject::tr("Kit Already Known"),
- QObject::tr("This kit was already registered."), QMessageBox::Ok);
+ QMessageBox::warning(0, tr("Kit Already Known"),
+ tr("This kit was already registered."), QMessageBox::Ok);
setSticky(kit);
return kit;
}
@@ -267,10 +267,10 @@ Kit *BlackBerryConfiguration::createKit(QnxArchitecture arch, BaseQtVersion *qtV
Debugger::DebuggerKitInformation::setDebuggerCommand(kit, m_simulatorDebuger);
Qt4ProjectManager::QmakeKitInformation::setMkspec(kit, FileName::fromString(QString::fromLatin1("blackberry-x86-qcc")));
// TODO: Check if the name already exists(?)
- kit->setDisplayName(QObject::tr("BlackBerry 10 (%1 - %2) - Simulator").arg(qtVersion->qtVersionString(), m_targetName));
+ kit->setDisplayName(tr("BlackBerry 10 (%1 - %2) - Simulator").arg(qtVersion->qtVersionString(), m_targetName));
} else {
Debugger::DebuggerKitInformation::setDebuggerCommand(kit, m_deviceDebuger);
- kit->setDisplayName(QObject::tr("BlackBerry 10 (%1 - %2)").arg(qtVersion->qtVersionString(), m_targetName));
+ kit->setDisplayName(tr("BlackBerry 10 (%1 - %2)").arg(qtVersion->qtVersionString(), m_targetName));
}
@@ -299,20 +299,20 @@ bool BlackBerryConfiguration::activate()
if (m_isAutoDetected)
return false;
- QString errorMessage = QObject::tr("The following errors occurred while activating Target: %1").arg(m_targetName);
+ QString errorMessage = tr("The following errors occurred while activating Target: %1").arg(m_targetName);
if (m_qmake4BinaryFile.isEmpty() && m_qmake4BinaryFile.isEmpty())
- errorMessage += QLatin1Char('\n') + QObject::tr("- No Qt version found.");
+ errorMessage += QLatin1Char('\n') + tr("- No Qt version found.");
if (m_gccCompiler.isEmpty())
- errorMessage += QLatin1Char('\n') + QObject::tr("- No GCC compiler found.");
+ errorMessage += QLatin1Char('\n') + tr("- No GCC compiler found.");
if (m_deviceDebuger.isEmpty())
- errorMessage += QLatin1Char('\n') + QObject::tr("- No GDB debugger found for BB10 Device.");
+ errorMessage += QLatin1Char('\n') + tr("- No GDB debugger found for BB10 Device.");
if (!m_simulatorDebuger.isEmpty())
- errorMessage += QLatin1Char('\n') + QObject::tr("- No GDB debugger found for BB10 Simulator.");
+ errorMessage += QLatin1Char('\n') + tr("- No GDB debugger found for BB10 Simulator.");
- QMessageBox::warning(0, QObject::tr("Cannot Set up BB10 Configuration"),
+ QMessageBox::warning(0, tr("Cannot Set up BB10 Configuration"),
errorMessage, QMessageBox::Ok);
return false;
}
diff --git a/src/plugins/qnx/blackberryconfiguration.h b/src/plugins/qnx/blackberryconfiguration.h
index 115ec5d7ff935807d9f19bb9832cdf9db7f7f02d..32961201cec41b07ce1bf1d7e077ee6d54509f13 100644
--- a/src/plugins/qnx/blackberryconfiguration.h
+++ b/src/plugins/qnx/blackberryconfiguration.h
@@ -43,12 +43,14 @@
#include <projectexplorer/gcctoolchain.h>
#include <QObject>
+#include <QCoreApplication>
namespace Qnx {
namespace Internal {
class BlackBerryConfiguration
{
+ Q_DECLARE_TR_FUNCTIONS(Qnx::Internal::BlackBerryConfiguration)
public:
BlackBerryConfiguration(const Utils::FileName &ndkEnvFile, bool isAutoDetected, const QString &displayName = QString());
bool activate();