diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-04-19 17:31:32 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-20 00:41:12 +0200 |
| commit | 2467652d63ad6395b58926f8e32e75fba430540c (patch) | |
| tree | 7729516bc127f66a3b655f8218b148e74d46f5f8 /tests | |
| parent | d4eb0e4531453064e00626b4615c044997949fba (diff) | |
QtDeclarative: No longer use QDeclarative compatibility defines.
Change-Id: Icbd9777cf1d978468c8023712ed90cd3c7dda56f
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/qquickgridview/tst_qquickgridview.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp index bc0108c842..f5019fce52 100644 --- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp +++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp @@ -47,6 +47,7 @@ #include <QtQml/qqmlcontext.h> #include <QtQml/qqmlexpression.h> #include <QtQml/qqmlincubator.h> +#include <QtQml/qqmlcontext.h> #include <QtQuick/private/qquickitem_p.h> #include <QtQuick/private/qquickgridview_p.h> #include <QtQuick/private/qquicktext_p.h> @@ -1265,7 +1266,7 @@ void tst_QQuickGridView::moved_defaultLayout(QQuickGridView::Flow flow, for (int i = 0; i < 30; i++) model.addItem("Item" + QString::number(i), ""); - QDeclarativeContext *ctxt = canvas->rootContext(); + QQmlContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("testModel", &model); ctxt->setContextProperty("testTopToBottom", flow == QQuickGridView::FlowTopToBottom); ctxt->setContextProperty("testRightToLeft", horizLayout == Qt::RightToLeft); diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index a31b30dc60..125e056dad 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -1688,7 +1688,7 @@ void tst_qquicktext::boundingRect() { QFETCH(QString, format); - QDeclarativeComponent component(&engine); + QQmlComponent component(&engine); component.setData("import QtQuick 2.0\n Text { textFormat:" + format.toUtf8() + "}", QUrl()); QScopedPointer<QObject> object(component.create()); QQuickText *text = qobject_cast<QQuickText *>(object.data()); |