diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-16 14:43:03 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 04:51:31 +0100 |
| commit | b855240b782395f94315f43ea3e7e182299fac48 (patch) | |
| tree | bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /tests/auto/shared/util.cpp | |
| parent | 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff) | |
Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported
by the quick1 module.
Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.
Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/shared/util.cpp')
| -rw-r--r-- | tests/auto/shared/util.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/auto/shared/util.cpp b/tests/auto/shared/util.cpp index 5a3d50f695..c015898ab7 100644 --- a/tests/auto/shared/util.cpp +++ b/tests/auto/shared/util.cpp @@ -41,19 +41,19 @@ #include "util.h" -#include <QtDeclarative/QDeclarativeComponent> -#include <QtDeclarative/QDeclarativeError> -#include <QtDeclarative/QDeclarativeContext> -#include <QtDeclarative/QDeclarativeEngine> +#include <QtQml/QQmlComponent> +#include <QtQml/QQmlError> +#include <QtQml/QQmlContext> +#include <QtQml/QQmlEngine> #include <QtCore/QTextStream> -QDeclarativeDataTest *QDeclarativeDataTest::m_instance = 0; +QQmlDataTest *QQmlDataTest::m_instance = 0; -QDeclarativeDataTest::QDeclarativeDataTest() : +QQmlDataTest::QQmlDataTest() : #ifdef QT_TESTCASE_BUILDDIR - m_dataDirectory(QTest::qFindTestData("data", QT_DECLARATIVETEST_DATADIR, 0, QT_TESTCASE_BUILDDIR)), + m_dataDirectory(QTest::qFindTestData("data", QT_QMLTEST_DATADIR, 0, QT_TESTCASE_BUILDDIR)), #else - m_dataDirectory(QTest::qFindTestData("data", QT_DECLARATIVETEST_DATADIR, 0)), + m_dataDirectory(QTest::qFindTestData("data", QT_QMLTEST_DATADIR, 0)), #endif m_dataDirectoryUrl(QUrl::fromLocalFile(m_dataDirectory + QLatin1Char('/'))) @@ -61,33 +61,33 @@ QDeclarativeDataTest::QDeclarativeDataTest() : m_instance = this; } -QDeclarativeDataTest::~QDeclarativeDataTest() +QQmlDataTest::~QQmlDataTest() { m_instance = 0; } -void QDeclarativeDataTest::initTestCase() +void QQmlDataTest::initTestCase() { QVERIFY2(!m_dataDirectory.isEmpty(), "'data' directory not found"); m_directory = QFileInfo(m_dataDirectory).absolutePath(); QVERIFY2(QDir::setCurrent(m_directory), qPrintable(QLatin1String("Could not chdir to ") + m_directory)); } -QString QDeclarativeDataTest::testFile(const QString &fileName) const +QString QQmlDataTest::testFile(const QString &fileName) const { if (m_directory.isEmpty()) - qFatal("QDeclarativeDataTest::initTestCase() not called."); + qFatal("QQmlDataTest::initTestCase() not called."); QString result = m_dataDirectory; result += QLatin1Char('/'); result += fileName; return result; } -QByteArray QDeclarativeDataTest::msgComponentError(const QDeclarativeComponent &c, - const QDeclarativeEngine *engine /* = 0 */) +QByteArray QQmlDataTest::msgComponentError(const QQmlComponent &c, + const QQmlEngine *engine /* = 0 */) { QString result; - const QList<QDeclarativeError> errors = c.errors(); + const QList<QQmlError> errors = c.errors(); QTextStream str(&result); str << "Component '" << c.url().toString() << "' has " << errors.size() << " errors: '"; @@ -98,7 +98,7 @@ QByteArray QDeclarativeDataTest::msgComponentError(const QDeclarativeComponent & } if (!engine) - if (QDeclarativeContext *context = c.creationContext()) + if (QQmlContext *context = c.creationContext()) engine = context->engine(); if (engine) { str << " Import paths: (" << engine->importPathList().join(QStringLiteral(", ")) |