From ae50eaa4109db683b121106f3c9bf497c603a88d Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 22 Apr 2013 16:39:34 +0200 Subject: [PATCH] Fix lupdate-warning "Cannot invoke tr() like this". Change-Id: I3ded3d9ab9fa202a3133c53fd6e17a8354481d0c Reviewed-by: Alan Alpert --- src/quick/items/qquickitemview.cpp | 2 +- src/quick/items/qquickpathview.cpp | 2 +- src/quick/items/qquickrepeater.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp index 72f8921..03e16f2 100644 --- a/src/quick/items/qquickitemview.cpp +++ b/src/quick/items/qquickitemview.cpp @@ -2205,7 +2205,7 @@ FxViewItem *QQuickItemViewPrivate::createItem(int modelIndex, bool asynchronous) if (!delegateValidated) { delegateValidated = true; QObject* delegate = q->delegate(); - qmlInfo(delegate ? delegate : q) << q->tr("Delegate must be of Item type"); + qmlInfo(delegate ? delegate : q) << QQuickItemView::tr("Delegate must be of Item type"); } } inRequest = false; diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp index e9aa698..7798641 100644 --- a/src/quick/items/qquickpathview.cpp +++ b/src/quick/items/qquickpathview.cpp @@ -159,7 +159,7 @@ QQuickItem *QQuickPathViewPrivate::getItem(int modelIndex, qreal z, bool async) if (!delegateValidated) { delegateValidated = true; QObject* delegate = q->delegate(); - qmlInfo(delegate ? delegate : q) << q->tr("Delegate must be of Item type"); + qmlInfo(delegate ? delegate : q) << QQuickPathView::tr("Delegate must be of Item type"); } } } else { diff --git a/src/quick/items/qquickrepeater.cpp b/src/quick/items/qquickrepeater.cpp index bf6d3c4..62ce78a 100644 --- a/src/quick/items/qquickrepeater.cpp +++ b/src/quick/items/qquickrepeater.cpp @@ -395,7 +395,7 @@ void QQuickRepeaterPrivate::createItems() if (!delegateValidated) { delegateValidated = true; QObject* delegate = q->delegate(); - qmlInfo(delegate ? delegate : q) << q->tr("Delegate must be of Item type"); + qmlInfo(delegate ? delegate : q) << QQuickRepeater::tr("Delegate must be of Item type"); } } createFrom = ii; -- 1.7.2.5