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.h | |
| 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.h')
| -rw-r--r-- | tests/auto/shared/util.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/shared/util.h b/tests/auto/shared/util.h index 9f73d9eb05..5a31ebd719 100644 --- a/tests/auto/shared/util.h +++ b/tests/auto/shared/util.h @@ -39,25 +39,25 @@ ** ****************************************************************************/ -#ifndef QDECLARATIVETESTUTILS_H -#define QDECLARATIVETESTUTILS_H +#ifndef QQMLTESTUTILS_H +#define QQMLTESTUTILS_H #include <QtCore/QDir> #include <QtCore/QUrl> #include <QtCore/QCoreApplication> #include <QtTest/QTest> -QT_FORWARD_DECLARE_CLASS(QDeclarativeComponent) -QT_FORWARD_DECLARE_CLASS(QDeclarativeEngine) +QT_FORWARD_DECLARE_CLASS(QQmlComponent) +QT_FORWARD_DECLARE_CLASS(QQmlEngine) /* Base class for tests with data that are located in a "data" subfolder. */ -class QDeclarativeDataTest : public QObject +class QQmlDataTest : public QObject { Q_OBJECT public: - QDeclarativeDataTest(); - virtual ~QDeclarativeDataTest(); + QQmlDataTest(); + virtual ~QQmlDataTest(); QString testFile(const QString &fileName) const; inline QString testFile(const char *fileName) const @@ -71,20 +71,20 @@ public: inline QUrl dataDirectoryUrl() const { return m_dataDirectoryUrl; } inline QString directory() const { return m_directory; } - static inline QDeclarativeDataTest *instance() { return m_instance; } + static inline QQmlDataTest *instance() { return m_instance; } - static QByteArray msgComponentError(const QDeclarativeComponent &, - const QDeclarativeEngine *engine = 0); + static QByteArray msgComponentError(const QQmlComponent &, + const QQmlEngine *engine = 0); public slots: virtual void initTestCase(); private: - static QDeclarativeDataTest *m_instance; + static QQmlDataTest *m_instance; const QString m_dataDirectory; const QUrl m_dataDirectoryUrl; QString m_directory; }; -#endif // QDECLARATIVETESTUTILS_H +#endif // QQMLTESTUTILS_H |