From fb9638d88f55107e5e8d7eb3bbc30bc99890feb9 Mon Sep 17 00:00:00 2001 From: Lincoln Ramsay Date: Thu, 8 Mar 2012 09:39:34 +1000 Subject: Rename declarative symbols. Use the script rename-qtdeclarative-symbols.sh. Change-Id: Ib1a62731a6c95590978a488c4afbd804f14fb958 Reviewed-by: Lincoln Ramsay --- tests/auto/legacy_sensors/legacy_sensors.pro | 2 +- tests/auto/legacy_sensors/tst_legacy_sensors.cpp | 26 +++++++++++----------- tests/auto/qtsensors5/qtsensors5.pro | 2 +- tests/auto/qtsensors5/tst_qtsensors5.cpp | 28 ++++++++++++------------ tests/auto/sensors2qmlapi/sensors2qmlapi.pro | 2 +- 5 files changed, 30 insertions(+), 30 deletions(-) (limited to 'tests') diff --git a/tests/auto/legacy_sensors/legacy_sensors.pro b/tests/auto/legacy_sensors/legacy_sensors.pro index a9b1531b..ef2e869b 100644 --- a/tests/auto/legacy_sensors/legacy_sensors.pro +++ b/tests/auto/legacy_sensors/legacy_sensors.pro @@ -1,6 +1,6 @@ TEMPLATE=app TARGET=tst_legacy_sensors !no_system_tests:CONFIG += testcase -QT = core testlib gui declarative sensors +QT = core testlib gui qml sensors SOURCES += tst_legacy_sensors.cpp diff --git a/tests/auto/legacy_sensors/tst_legacy_sensors.cpp b/tests/auto/legacy_sensors/tst_legacy_sensors.cpp index 05f2d059..2e0f1945 100644 --- a/tests/auto/legacy_sensors/tst_legacy_sensors.cpp +++ b/tests/auto/legacy_sensors/tst_legacy_sensors.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include -#include -#include +#include +#include #include class tst_legacy_sensors : public QObject @@ -78,16 +78,16 @@ private slots: QFETCH(QString, version); QFETCH(bool, exists); - QDeclarativeEngine engine; + QQmlEngine engine; QString qml = QString("import QtQuick 2.0\nimport QtMobility.sensors %1\nItem {}").arg(version); - QDeclarativeComponent c(&engine); + QQmlComponent c(&engine); c.setData(qml.toLocal8Bit(), QUrl::fromLocalFile(QDir::currentPath())); if (!exists) - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready"); + QTest::ignoreMessage(QtWarningMsg, "QQmlComponent: Component is not ready"); QObject *obj = c.create(); QCOMPARE(exists, (obj != 0)); delete obj; - QList errors = c.errors(); + QList errors = c.errors(); if (exists) { QCOMPARE(errors.count(), 0); } else { @@ -175,16 +175,16 @@ private slots: QFETCH(QString, element); QFETCH(bool, exists); - QDeclarativeEngine engine; + QQmlEngine engine; QString qml = QString("import QtQuick 2.0\nimport QtMobility.sensors %1\n%2 {}").arg(version).arg(element); - QDeclarativeComponent c(&engine); + QQmlComponent c(&engine); c.setData(qml.toLocal8Bit(), QUrl::fromLocalFile(QDir::currentPath())); if (!exists) - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready"); + QTest::ignoreMessage(QtWarningMsg, "QQmlComponent: Component is not ready"); QObject *obj = c.create(); QCOMPARE(exists, (obj != 0)); delete obj; - QList errors = c.errors(); + QList errors = c.errors(); if (exists) { QCOMPARE(errors.count(), 0); } else { @@ -240,11 +240,11 @@ private slots: QFETCH(QString, element); QFETCH(bool, validSyntax); - QDeclarativeEngine engine; + QQmlEngine engine; QString qml = QString("import QtQuick 2.0\nimport QtMobility.sensors %1\n%2 {\nalwaysOn: true\n}").arg(version).arg(element); - QDeclarativeComponent c(&engine); + QQmlComponent c(&engine); if (!validSyntax) - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready"); + QTest::ignoreMessage(QtWarningMsg, "QQmlComponent: Component is not ready"); c.setData(qml.toLocal8Bit(), QUrl::fromLocalFile(QDir::currentPath())); QObject *obj = c.create(); if (validSyntax) { diff --git a/tests/auto/qtsensors5/qtsensors5.pro b/tests/auto/qtsensors5/qtsensors5.pro index 38b89ff4..45c2b68e 100644 --- a/tests/auto/qtsensors5/qtsensors5.pro +++ b/tests/auto/qtsensors5/qtsensors5.pro @@ -1,6 +1,6 @@ TEMPLATE=app TARGET=tst_qtsensors5 !no_system_tests:CONFIG += testcase -QT = core testlib gui declarative +QT = core testlib gui qml SOURCES += tst_qtsensors5.cpp diff --git a/tests/auto/qtsensors5/tst_qtsensors5.cpp b/tests/auto/qtsensors5/tst_qtsensors5.cpp index 383a4762..31f0f852 100644 --- a/tests/auto/qtsensors5/tst_qtsensors5.cpp +++ b/tests/auto/qtsensors5/tst_qtsensors5.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include -#include -#include +#include +#include class tst_qtsensors5 : public QObject { @@ -74,16 +74,16 @@ private slots: QFETCH(QString, version); QFETCH(bool, exists); - QDeclarativeEngine engine; + QQmlEngine engine; QString qml = QString("import QtQuick 2.0\nimport QtSensors %1\nItem {}").arg(version); - QDeclarativeComponent c(&engine); + QQmlComponent c(&engine); c.setData(qml.toLocal8Bit(), QUrl::fromLocalFile(QDir::currentPath())); if (!exists) - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready"); + QTest::ignoreMessage(QtWarningMsg, "QQmlComponent: Component is not ready"); QObject *obj = c.create(); QCOMPARE(exists, (obj != 0)); delete obj; - QList errors = c.errors(); + QList errors = c.errors(); if (exists) { QCOMPARE(errors.count(), 0); } else { @@ -112,16 +112,16 @@ private slots: QFETCH(QString, element); QFETCH(bool, exists); - QDeclarativeEngine engine; + QQmlEngine engine; QString qml = QString("import QtQuick 2.0\nimport QtSensors %1\n%2 {}").arg(version).arg(element); - QDeclarativeComponent c(&engine); + QQmlComponent c(&engine); c.setData(qml.toLocal8Bit(), QUrl::fromLocalFile(QDir::currentPath())); if (!exists) - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready"); + QTest::ignoreMessage(QtWarningMsg, "QQmlComponent: Component is not ready"); QObject *obj = c.create(); QCOMPARE(exists, (obj != 0)); delete obj; - QList errors = c.errors(); + QList errors = c.errors(); QCOMPARE(errors.count(), 0); } @@ -138,15 +138,15 @@ private slots: QFETCH(QString, version); QFETCH(QString, element); - QDeclarativeEngine engine; + QQmlEngine engine; QString qml = QString("import QtQuick 2.0\nimport QtSensors %1\n%2 {}").arg(version).arg(element); - QDeclarativeComponent c(&engine); + QQmlComponent c(&engine); c.setData(qml.toLocal8Bit(), QUrl::fromLocalFile(QDir::currentPath())); - //QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready"); + //QTest::ignoreMessage(QtWarningMsg, "QQmlComponent: Component is not ready"); QObject *obj = c.create(); QCOMPARE(obj, static_cast(0)); delete obj; - QList errors = c.errors(); + QList errors = c.errors(); QCOMPARE(errors.count(), 1); QString expected = QString("Cannot create %1").arg(element); QString actual = errors.first().description(); diff --git a/tests/auto/sensors2qmlapi/sensors2qmlapi.pro b/tests/auto/sensors2qmlapi/sensors2qmlapi.pro index 836cce0e..28043601 100644 --- a/tests/auto/sensors2qmlapi/sensors2qmlapi.pro +++ b/tests/auto/sensors2qmlapi/sensors2qmlapi.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = tst_sensors2qmlapi CONFIG += testcase -QT = core testlib sensors-private declarative +QT = core testlib sensors-private qml INCLUDEPATH += ./ DEPENDPATH += ./ -- cgit v1.2.3