diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2012-09-14 15:33:20 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-18 08:46:36 +0200 |
| commit | 5120eec7fc741921318a5538fe15fbcb6bc73f7c (patch) | |
| tree | ba45750be59a10c1d69521512d9372fc88207d83 /tests/auto/declarative/qdeclarativetimer | |
| parent | 5f7494513e35c92f802ff9fdca4baa6ad2246003 (diff) | |
Remove Symbian platform
Change-Id: Iad770614f7c1c890febeee662d0ce9370dcb17e3
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativetimer')
| -rw-r--r-- | tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro | 4 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp | 10 |
2 files changed, 1 insertions, 13 deletions
diff --git a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro index 69f0cb01..6cf72b80 100644 --- a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro +++ b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro @@ -7,9 +7,7 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetimer.cpp -!symbian: { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} +DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp index 1f68ff08..ffc60ffe 100644 --- a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp +++ b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp @@ -46,11 +46,6 @@ #include <QtQuick1/qdeclarativeitem.h> #include <QDebug> -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -#define SRCDIR "." -#endif - class tst_qdeclarativetimer : public QObject { Q_OBJECT @@ -85,12 +80,7 @@ public slots: } }; -#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86) -// Increase wait as emulator startup can cause unexpected delays -#define TIMEOUT_TIMEOUT 2000 -#else #define TIMEOUT_TIMEOUT 200 -#endif tst_qdeclarativetimer::tst_qdeclarativetimer() { |