diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-09-28 16:52:12 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-30 10:37:05 +0200 |
| commit | b1e650a889fd18bdc47aed07c518f5f8ba663d97 (patch) | |
| tree | c79864873bda8eec2588b63e0d1edd5ab61f9323 /tests/auto/qtquick1/qdeclarativeviewer | |
| parent | 2bb6c25b231193c19e3b52275471f274624cb408 (diff) | |
Remove Symbian-specific code from tests.
Symbian is not a supported platform for Qt5, so this code is no longer
required.
Change-Id: I5cb6d3b41fbb9fa5fea6176ad949e4e7be7c30b5
Reviewed-on: http://codereview.qt-project.org/5767
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/qtquick1/qdeclarativeviewer')
| -rw-r--r-- | tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro | 9 | ||||
| -rw-r--r-- | tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp | 7 |
2 files changed, 2 insertions, 14 deletions
diff --git a/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro b/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro index 433eaf8029..5f96dac005 100644 --- a/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro +++ b/tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro @@ -6,14 +6,7 @@ include(../../../../tools/qmlviewer/qml.pri) SOURCES += tst_qdeclarativeviewer.cpp -symbian: { - include(../symbianlibs.pri) - importFiles.files = data - importFiles.path = . - DEPLOYMENT += importFiles -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} +DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test insignificant_test QT += core-private gui-private widgets-private declarative-private qtquick1-private widgets-private v8-private diff --git a/tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp b/tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp index e6bd2d0a31..6db8b4fbfb 100644 --- a/tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp +++ b/tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp @@ -51,12 +51,7 @@ #include "deviceorientation.h" #include "../../../shared/util.h" -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -#define SRCDIR "." -#endif - -#if defined(Q_OS_MAC) || defined(Q_WS_MAEMO_5) || defined(Q_WS_S60) +#if defined(Q_OS_MAC) || defined(Q_WS_MAEMO_5) # define MENUBAR_HEIGHT(mw) 0 #else # define MENUBAR_HEIGHT(mw) (mw->menuBar()->height()) |