diff --git a/src/libs/qmljs/qmljsstaticanalysismessage.cpp b/src/libs/qmljs/qmljsstaticanalysismessage.cpp index b6af6185cbb8d069eb3cdb918f23577cb30809f7..0d3de2f4c2ceaef9f26a9763a8080a50177d92b0 100644 --- a/src/libs/qmljs/qmljsstaticanalysismessage.cpp +++ b/src/libs/qmljs/qmljsstaticanalysismessage.cpp @@ -40,7 +40,7 @@ namespace { class StaticAnalysisMessages { - Q_DECLARE_TR_FUNCTIONS(StaticAnalysisMessages) + Q_DECLARE_TR_FUNCTIONS(QmlJS::StaticAnalysisMessages) public: class PrototypeMessageData { diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp index b4798ed35b08758e76b8326edd41394bd7489f86..8421c913cf740d4ce8dfc5526a98831886649954 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp @@ -70,6 +70,7 @@ namespace CMakeProjectManager { namespace Internal { class GeneratorInfo { + Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::GeneratorInfo) public: enum Ninja { NoNinja, OfferNinja, ForceNinja }; static QList<GeneratorInfo> generatorInfosFor(ProjectExplorer::Kit *k, Ninja n, bool hasCodeBlocks); @@ -148,7 +149,7 @@ QString GeneratorInfo::displayName() const if (!m_kit) return QString(); if (m_isNinja) - return QApplication::tr("Ninja (%1)").arg(m_kit->displayName()); + return tr("Ninja (%1)").arg(m_kit->displayName()); ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(m_kit); ProjectExplorer::Abi targetAbi = tc->targetAbi(); if (targetAbi.os() == ProjectExplorer::Abi::WindowsOS) { @@ -156,16 +157,16 @@ QString GeneratorInfo::displayName() const || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2008Flavor || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2010Flavor || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2012Flavor) { - return QApplication::tr("NMake Generator (%1)").arg(m_kit->displayName()); + return tr("NMake Generator (%1)").arg(m_kit->displayName()); } else if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) { if (Utils::HostOsInfo::isWindowsHost()) - return QApplication::tr("MinGW Generator (%1)").arg(m_kit->displayName()); + return tr("MinGW Generator (%1)").arg(m_kit->displayName()); else - return QApplication::tr("Unix Generator (%1)").arg(m_kit->displayName()); + return tr("Unix Generator (%1)").arg(m_kit->displayName()); } } else { // Non windows - return QApplication::tr("Unix Generator (%1)").arg(m_kit->displayName()); + return tr("Unix Generator (%1)").arg(m_kit->displayName()); } return QString(); } diff --git a/src/plugins/cpptools/builtinindexingsupport.cpp b/src/plugins/cpptools/builtinindexingsupport.cpp index e94ffb9ee3602f43c61ab0bbe142413961ed76e5..e5c4ad83da419aa6c5ab17c26d7aefc117c08e8c 100644 --- a/src/plugins/cpptools/builtinindexingsupport.cpp +++ b/src/plugins/cpptools/builtinindexingsupport.cpp @@ -200,7 +200,7 @@ QFuture<void> BuiltinIndexingSupport::refreshSourceFiles(const QStringList &sour if (sourceFiles.count() > 1) { Core::ICore::progressManager()->addTask(result, - QCoreApplication::translate("IndexingSupport", "Parsing"), + QCoreApplication::translate("CppTools::Internal::BuiltinIndexingSupport", "Parsing"), QLatin1String(CppTools::Constants::TASK_INDEX)); } diff --git a/src/plugins/qmljstools/qmlconsolemanager.cpp b/src/plugins/qmljstools/qmlconsolemanager.cpp index 34358714f79af0cbe0917560edbfda4741ca12e1..9bde33c045f63dc6fc88580f128a19e1bf894148 100644 --- a/src/plugins/qmljstools/qmlconsolemanager.cpp +++ b/src/plugins/qmljstools/qmlconsolemanager.cpp @@ -36,6 +36,7 @@ #include <qmljs/iscriptevaluator.h> #include <QVariant> +#include <QCoreApplication> using namespace QmlJS; @@ -174,7 +175,8 @@ void QmlConsoleModel::evaluate(const QString &expression) } else { ConsoleItem *root = manager->rootItem(); ConsoleItem *item = constructLogItemTree( - root, QObject::tr("Can only evaluate during a QML debug session.")); + root, QCoreApplication::translate("QmlJSTools::Internal::QmlConsoleModel", + "Can only evaluate during a QML debug session.")); if (item) { QmlConsoleModel::qmlConsoleItemModel()->appendEditableRow(); manager->printToConsolePane(item);