diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-10-12 13:46:02 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-14 02:39:59 +0200 |
| commit | 6b497734df0c4f13f6b7185801fc69ce680c698c (patch) | |
| tree | 66b0b8cd32a91f8c7e753a3ef124050188035c3c /tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp | |
| parent | 5f7c22001163eb4bce25be1cfee4e84c5a25ff09 (diff) | |
Use TESTDATA macro in declarative tests.
Includes a few other minor cleanups as well.
Task-number: QTBUG-21721
Change-Id: I5b1c2c116e63748c6b4199183212de8a00037af1
Reviewed-on: http://codereview.qt-project.org/6473
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp b/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp index 7e27146609..224426e2ec 100644 --- a/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp +++ b/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp @@ -50,11 +50,11 @@ #include <QDeclarativeProperty> #include <QDeclarativeComponent> #include <QDeclarativeIncubator> +#include "../shared/util.h" inline QUrl TEST_FILE(const QString &filename) { - QFileInfo fileInfo(__FILE__); - return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath("data/" + filename)); + return QUrl::fromLocalFile(TESTDATA(filename)); } inline QUrl TEST_FILE(const char *filename) @@ -95,7 +95,7 @@ private: QVERIFY(!component.isError()); \ QVERIFY(component.errors().isEmpty()); \ } else { \ - QFile file(QLatin1String(SRCDIR) + QLatin1String("/data/") + QLatin1String(errorfile)); \ + QFile file(TESTDATA(errorfile)); \ QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); \ QByteArray data = file.readAll(); \ file.close(); \ |