Fix lupdate-warning "Cannot invoke tr() like this".
authorFriedemann Kleint <Friedemann.Kleint@digia.com>
Mon, 22 Apr 2013 14:39:34 +0000 (16:39 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 23 Apr 2013 05:34:46 +0000 (07:34 +0200)
Change-Id: I3ded3d9ab9fa202a3133c53fd6e17a8354481d0c
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
src/quick/items/qquickitemview.cpp
src/quick/items/qquickpathview.cpp
src/quick/items/qquickrepeater.cpp

index 72f8921..03e16f2 100644 (file)
@@ -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;
index e9aa698..7798641 100644 (file)
@@ -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 {
index bf6d3c4..62ce78a 100644 (file)
@@ -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;