diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-08-31 14:40:38 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-08-31 14:40:38 +0200 |
| commit | c56aa52b8082bf39bd822f8d110f4a41757100f9 (patch) | |
| tree | 22ee09ed89b75d1e08674f5836bb516c8f1ab048 /src/libs/modelinglib | |
| parent | a4bf137a9f0319c6f3b9ecc3345d1ab9520f128c (diff) | |
| parent | 89ff2c1db5ee2068cf763ff1789b17b7f2afa118 (diff) | |
| download | qt-creator-c56aa52b8082bf39bd822f8d110f4a41757100f9.tar.gz | |
Merge remote-tracking branch 'origin/4.1'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/qmakeprojectmanager/makestep.cpp
src/shared/qbs
Change-Id: If1787ed23afa786ed2cef57f53c1db642559cbe0
Diffstat (limited to 'src/libs/modelinglib')
| -rw-r--r-- | src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp index 0b87e6f716..03ff3b65bb 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp +++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp @@ -65,6 +65,7 @@ #include "qmt/style/style.h" #include "qmt/style/objectvisuals.h" +#include <QCoreApplication> #include <QWidget> #include <QFormLayout> #include <QLineEdit> @@ -1364,7 +1365,7 @@ void PropertiesView::MView::setTitle(const QList<V *> &elements, else m_propertiesTitle = pluralTitle; } else { - m_propertiesTitle = tr("Multi-Selection"); + m_propertiesTitle = QCoreApplication::translate("qmt::PropertiesView::MView", "Multi-Selection"); } } @@ -1389,7 +1390,7 @@ void PropertiesView::MView::setTitle(const MItem *item, const QList<V *> &elemen m_propertiesTitle = pluralTitle; } } else { - m_propertiesTitle = tr("Multi-Selection"); + m_propertiesTitle = QCoreApplication::translate("qmt::PropertiesView::MView", "Multi-Selection"); } } } |