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/qdeclarativestates | |
| 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/qdeclarativestates')
| -rw-r--r-- | tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro | 4 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro b/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro index 6f4ecb3..2bae041 100644 --- a/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro +++ b/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro @@ -4,11 +4,9 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativestates.cpp -# Define SRCDIR equal to test's source directory symbian: { - DEFINES += SRCDIR=\".\" importFiles.sources = data - importFiles.path = + importFiles.path = . DEPLOYMENT = importFiles } else { DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp index 1ddbe4d..2913ddd 100644 --- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp +++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp @@ -49,6 +49,10 @@ #include <private/qdeclarativestategroup_p.h> #include <private/qdeclarativeitem_p.h> +#ifdef Q_OS_SYMBIAN +// In Symbian OS test data is located in applications private dir +#define SRCDIR "." +#endif class MyAttached : public QObject { |