diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-06-15 12:55:18 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-06-15 12:55:18 (GMT) |
| commit | 2cb5d8f7425bce83b5e95925e15d7920be3d2e8d (patch) | |
| tree | 8b44fe4a9c0fc286e0017a6f34e669d53cb0299e /tests/auto/declarative/examples | |
| parent | e9e93fe79d7451f05a714241f759c557a455de67 (diff) | |
| parent | 11420641d9341af6615baa21453e08c092f7fb10 (diff) | |
| download | Qt-2cb5d8f7425bce83b5e95925e15d7920be3d2e8d.zip Qt-2cb5d8f7425bce83b5e95925e15d7920be3d2e8d.tar.gz Qt-2cb5d8f7425bce83b5e95925e15d7920be3d2e8d.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tests/auto/declarative/examples')
| -rw-r--r-- | tests/auto/declarative/examples/examples.pro | 3 | ||||
| -rw-r--r-- | tests/auto/declarative/examples/tst_examples.cpp | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro index 92a16f1..2e243b4 100644 --- a/tests/auto/declarative/examples/examples.pro +++ b/tests/auto/declarative/examples/examples.pro @@ -7,9 +7,8 @@ SOURCES += tst_examples.cpp include(../../../../tools/qml/qml.pri) symbian: { - DEFINES += SRCDIR=\".\" importFiles.sources = data - importFiles.path = + importFiles.path = . DEPLOYMENT = importFiles } else { DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp index 605345e..cff0b46 100644 --- a/tests/auto/declarative/examples/tst_examples.cpp +++ b/tests/auto/declarative/examples/tst_examples.cpp @@ -47,6 +47,11 @@ #include <QDeclarativeView> #include <QDeclarativeError> +#ifdef Q_OS_SYMBIAN +// In Symbian OS test data is located in applications private dir +#define SRCDIR "." +#endif + class tst_examples : public QObject { Q_OBJECT @@ -80,6 +85,7 @@ tst_examples::tst_examples() // Add directories you want excluded here + excludedDirs << "doc/src/snippets/declarative/visualdatamodel_rootindex"; #ifdef QT_NO_WEBKIT excludedDirs << "examples/declarative/modelviews/webview"; |