diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-27 11:19:12 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-29 10:26:30 +0100 |
| commit | 9d8093099a3882bce922884e084977820f97cb62 (patch) | |
| tree | f6e2bc552b3efa7c47adda348c35ca97a7ffc6ef /src | |
| parent | 525eebcd3aa9b1c04bc6489ebe73c18d619ebdf9 (diff) | |
tr()-Fix: Do not use QObject::tr().
Change-Id: I85eb3f429d273b69270817eb4e9f1c386b5cda20
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/xmllistmodel/qqmlxmllistmodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp index a7a2e22d13..8b30dc7373 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp +++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp @@ -590,7 +590,7 @@ void QQuickXmlListModelPrivate::append_role(QQmlListProperty<QQuickXmlListModelR int i = _this->d_func()->roleObjects.count(); _this->d_func()->roleObjects.append(role); if (_this->d_func()->roleNames.contains(role->name())) { - qmlInfo(role) << QObject::tr("\"%1\" duplicates a previous role name and will be disabled.").arg(role->name()); + qmlInfo(role) << QQuickXmlListModel::tr("\"%1\" duplicates a previous role name and will be disabled.").arg(role->name()); return; } _this->d_func()->roles.insert(i, _this->d_func()->highestRole); @@ -1124,11 +1124,11 @@ void QQuickXmlListModel::queryError(void* object, const QString& error) Q_D(QQuickXmlListModel); for (int i=0; i<d->roleObjects.count(); i++) { if (d->roleObjects.at(i) == static_cast<QQuickXmlListModelRole*>(object)) { - qmlInfo(d->roleObjects.at(i)) << QObject::tr("invalid query: \"%1\"").arg(error); + qmlInfo(d->roleObjects.at(i)) << QQuickXmlListModel::tr("invalid query: \"%1\"").arg(error); return; } } - qmlInfo(this) << QObject::tr("invalid query: \"%1\"").arg(error); + qmlInfo(this) << QQuickXmlListModel::tr("invalid query: \"%1\"").arg(error); } void QQuickXmlListModel::queryCompleted(const QQuickXmlQueryResult &result) |