diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp index 4727f0748577cc48535db8968eded5a7f31518e7..dc9d95596c8491218596a56650acc7b92555b4c3 100644 --- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp @@ -40,7 +40,7 @@ #include <QtCore/QMargins> #include <QtCore/QTimer> -#include <QtGui/QApplication> +#include <QtCore/QCoreApplication> #include <QtGui/QComboBox> #include <QtGui/QInputDialog> #include <QtGui/QLabel> @@ -62,7 +62,7 @@ QString BuildSettingsPanelFactory::id() const QString BuildSettingsPanelFactory::displayName() const { - return QApplication::tr("Build Settings"); + return QCoreApplication::translate("BuildSettingsPanelFactory", "Build Settings"); } bool BuildSettingsPanelFactory::supports(Project *project) @@ -105,7 +105,7 @@ BuildSettingsPanel::~BuildSettingsPanel() QString BuildSettingsPanel::displayName() const { - return QApplication::tr("Build Settings"); + return QCoreApplication::translate("BuildSettingsPanel", "Build Settings"); } QWidget *BuildSettingsPanel::widget() const diff --git a/src/plugins/projectexplorer/dependenciespanel.cpp b/src/plugins/projectexplorer/dependenciespanel.cpp index f33b1cf030c8ff95af7dd60a0e1eaaef072e550c..b930fd5eb53cb9b610fce4d92c3b54f773f6d3bf 100644 --- a/src/plugins/projectexplorer/dependenciespanel.cpp +++ b/src/plugins/projectexplorer/dependenciespanel.cpp @@ -270,7 +270,7 @@ DependenciesPanel::~DependenciesPanel() QString DependenciesPanel::displayName() const { - return QApplication::tr("Dependencies"); + return QCoreApplication::translate("DependenciesPanel", "Dependencies"); } QWidget *DependenciesPanel::widget() const @@ -299,7 +299,7 @@ QString DependenciesPanelFactory::id() const QString DependenciesPanelFactory::displayName() const { - return QApplication::tr("Dependencies"); + return QCoreApplication::translate("DependenciesPanelFactory", "Dependencies"); } bool DependenciesPanelFactory::supports(Project *project) diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp index 5c58468552f2f0b8302e5a9de310a4bc4d6e5553..a2566a2a14de0f20bc82d45837b21ca4a0cdbe1f 100644 --- a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp @@ -45,7 +45,7 @@ QString EditorSettingsPanelFactory::id() const QString EditorSettingsPanelFactory::displayName() const { - return QApplication::tr("Editor Settings"); + return QCoreApplication::translate("EditorSettingsPanelFactory", "Editor Settings"); } bool EditorSettingsPanelFactory::supports(Project *project) @@ -84,7 +84,7 @@ EditorSettingsPanel::~EditorSettingsPanel() QString EditorSettingsPanel::displayName() const { - return QApplication::tr("Editor Settings"); + return QCoreApplication::translate("EditorSettingsPanel", "Editor Settings"); } QWidget *EditorSettingsPanel::widget() const diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp index 907583a32ba7b3dfc95017961f9fb99e43e84a27..51cb60ed70d3dabd0ebc016a5c35ea792a8bffba 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp @@ -100,7 +100,7 @@ QString RunSettingsPanelFactory::id() const QString RunSettingsPanelFactory::displayName() const { - return QApplication::tr("Run Settings"); + return QCoreApplication::tr("RunSettingsPanelFactory", "Run Settings"); } bool RunSettingsPanelFactory::supports(Project *project) @@ -142,7 +142,7 @@ RunSettingsPanel::~RunSettingsPanel() QString RunSettingsPanel::displayName() const { - return QApplication::tr("Run Settings"); + return QCoreApplication::translate("RunSettingsPanel", "Run Settings"); } QWidget *RunSettingsPanel::widget() const @@ -192,7 +192,7 @@ QVariant RunConfigurationsModel::data(const QModelIndex &index, int role) const if (row < m_runConfigurations.size()) { RunConfiguration *rc = m_runConfigurations.at(row); if (rc == m_activeRunConfiguration) - return tr("%1 (Active)").arg(rc->displayName()); + return QCoreApplication::translate("RunConfigurationsModel", "%1 (Active)").arg(rc->displayName()); return rc->displayName(); } } diff --git a/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp b/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp index 720ef5403f8225f96269b9b68c9b47ed556d0294..8308ba100e8d53faa6559044afa4e7932724aa7e 100644 --- a/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp +++ b/src/plugins/qmldesigner/components/integration/xuifiledialog.cpp @@ -27,9 +27,10 @@ ** **************************************************************************/ -#include <QDebug> +#include <QtCore/QDebug> #include <QtCore/QDir> #include <QtCore/QObject> +#include <QtCore/QCoreApplication> #include "xuifiledialog.h" @@ -41,7 +42,7 @@ void XUIFileDialog::runOpenFileDialog(const QString& path, QWidget* parent, QObj if (dir.isNull()) dir = XUIFileDialog::defaultFolder(); - QString caption = QObject::tr("Open file", "XUIFileDialog::runOpenFileDialog"); + QString caption = QCoreApplication::translate("QmlDesigner::XUIFileDialog", "Open file"); QString fileName = QFileDialog::getOpenFileName(parent, caption, dir, XUIFileDialog::fileNameFilters().join(";;"), 0, QFileDialog::ReadOnly); QmlDesigner::Internal::SignalEmitter emitter; @@ -63,7 +64,7 @@ void XUIFileDialog::runSaveFileDialog(const QString& path, QWidget* parent, QObj dialog->setDirectory(dir); dialog->open(receiver, member); #else // !Q_WS_MAC - QString caption = QObject::tr("Save file", "XUIFileDialog::runSaveFileDialog"); + QString caption = QCoreApplication::translate("QmlDesigner::XUIFileDialog", "Save file"); QString fileName = QFileDialog::getSaveFileName(parent, caption, dir, XUIFileDialog::fileNameFilters().join(";;")); QmlDesigner::Internal::SignalEmitter emitter; @@ -77,8 +78,8 @@ QStringList XUIFileDialog::fileNameFilters() QStringList filters; filters - << QObject::tr("Declarative UI files (*.qml)", "XUIFileDialog::fileNameFilters") - << QObject::tr("All files (*)", "XUIFileDialog::fileNameFilters"); + << QCoreApplication::translate("QmlDesigner::XUIFileDialog", "Declarative UI files (*.qml)") + << QCoreApplication::translate("QmlDesigner::XUIFileDialog", "All files (*)"); return filters; }