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/qdeclarativeqt | |
| 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/qdeclarativeqt')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro | 7 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro index 1b8bf3f790..18fb8b2027 100644 --- a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro +++ b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro @@ -3,10 +3,9 @@ TARGET = tst_qdeclarativeqt SOURCES += tst_qdeclarativeqt.cpp macx:CONFIG -= app_bundle -DEFINES += SRCDIR=\\\"$$PWD\\\" - -# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -# LIBS += -lgcov +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles CONFIG += parallel_test diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp index 9359030ff8..dbf5373599 100644 --- a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp +++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp @@ -52,6 +52,7 @@ #include <QCryptographicHash> #include <QSGItem> #include <QSignalSpy> +#include "../shared/util.h" class tst_qdeclarativeqt : public QObject { @@ -95,7 +96,7 @@ private: inline QUrl TEST_FILE(const QString &filename) { - return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename); + return QUrl::fromLocalFile(TESTDATA(filename)); } void tst_qdeclarativeqt::enums() |