diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-03-08 09:39:34 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-08 01:05:21 +0100 |
| commit | fb9638d88f55107e5e8d7eb3bbc30bc99890feb9 (patch) | |
| tree | 262ee024178dd62c3958839b228a84ddbbcc3bef /tests/auto/legacy_sensors | |
| parent | 3df9caea52f7136e0bf2e22120b6715a5ab3de45 (diff) | |
Rename declarative symbols.
Use the script rename-qtdeclarative-symbols.sh.
Change-Id: Ib1a62731a6c95590978a488c4afbd804f14fb958
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'tests/auto/legacy_sensors')
| -rw-r--r-- | tests/auto/legacy_sensors/legacy_sensors.pro | 2 | ||||
| -rw-r--r-- | tests/auto/legacy_sensors/tst_legacy_sensors.cpp | 26 |
2 files changed, 14 insertions, 14 deletions
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 <QtTest/QtTest> -#include <QDeclarativeEngine> -#include <QDeclarativeComponent> +#include <QQmlEngine> +#include <QQmlComponent> #include <QSensor> 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<QDeclarativeError> errors = c.errors(); + QList<QQmlError> 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<QDeclarativeError> errors = c.errors(); + QList<QQmlError> 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) { |