diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-06-08 01:01:11 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-06-08 01:01:11 (GMT) |
| commit | 315d186907c60b894b0bb1cf21e11758ee52966a (patch) | |
| tree | 9f1734fe2b560948f6adb98c69aab3c7f99f007c /tests/auto/declarative/qdeclarativeviewer | |
| parent | 0656d1578e86a2e9e0e1ec1d3c79e8766415a86d (diff) | |
| parent | e4c7f469d1cdaf535b5e7aacaca7f96553084b79 (diff) | |
| download | Qt-315d186907c60b894b0bb1cf21e11758ee52966a.zip Qt-315d186907c60b894b0bb1cf21e11758ee52966a.tar.gz Qt-315d186907c60b894b0bb1cf21e11758ee52966a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativeviewer')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro | 3 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro index 9bb6161..6189916 100644 --- a/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro +++ b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro @@ -7,9 +7,8 @@ include(../../../../tools/qml/qml.pri) SOURCES += tst_qdeclarativeviewer.cpp symbian: { - DEFINES += SRCDIR=\".\" importFiles.sources = data - importFiles.path = + importFiles.path = . DEPLOYMENT = importFiles } else { DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp index f296d9e..49273ea 100644 --- a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp +++ b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp @@ -45,6 +45,11 @@ #include <QtDeclarative/qdeclarativeitem.h> #include "qmlruntime.h" +#ifdef Q_OS_SYMBIAN +// In Symbian OS test data is located in applications private dir +#define SRCDIR "." +#endif + class tst_QDeclarativeViewer : public QObject { |