diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-09-27 19:53:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 06:41:42 +0200 |
| commit | 95cebd34ebc5b4d39b11dc91610309a35e488663 (patch) | |
| tree | 90ceffef5acea093dd2b8f8f7e8c30593023b85a /tests/auto/qdirmodel | |
| parent | ab061e3e436fab35eac8666f3e950e98f66c4d3e (diff) | |
Remove Symbian-specific code from tests.
Symbian is not a supported platform for Qt5, so this code is no longer
required.
Change-Id: I1172e6a42d518490e63e9599bf10579df08259aa
Reviewed-on: http://codereview.qt-project.org/5657
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/qdirmodel')
| -rw-r--r-- | tests/auto/qdirmodel/qdirmodel.pro | 5 | ||||
| -rw-r--r-- | tests/auto/qdirmodel/tst_qdirmodel.cpp | 14 |
2 files changed, 1 insertions, 18 deletions
diff --git a/tests/auto/qdirmodel/qdirmodel.pro b/tests/auto/qdirmodel/qdirmodel.pro index 7c0409334c..bc4e98d6ff 100644 --- a/tests/auto/qdirmodel/qdirmodel.pro +++ b/tests/auto/qdirmodel/qdirmodel.pro @@ -2,7 +2,7 @@ load(qttest_p4) QT += widgets SOURCES += tst_qdirmodel.cpp -wince*|symbian { +wince* { addit.files = dirtest\\test1\\* addit.path = dirtest\\test1 tests.files = test\\* @@ -14,9 +14,6 @@ wince*|symbian { wince*: { DEFINES += SRCDIR=\\\"./\\\" -} else:symbian { - TARGET.UID3 = 0xE0340003 - DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x","")) } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/auto/qdirmodel/tst_qdirmodel.cpp b/tests/auto/qdirmodel/tst_qdirmodel.cpp index db424a2af7..2e7b012ce6 100644 --- a/tests/auto/qdirmodel/tst_qdirmodel.cpp +++ b/tests/auto/qdirmodel/tst_qdirmodel.cpp @@ -50,12 +50,6 @@ //TESTED_CLASS= //TESTED_FILES= -#if defined(Q_OS_SYMBIAN) -# define STRINGIFY(x) #x -# define TOSTRING(x) STRINGIFY(x) -# define SRCDIR "C:/Private/" TOSTRING(SYMBIAN_SRCDIR_UID) "/" -#endif - class tst_QDirModel : public QObject { Q_OBJECT @@ -583,9 +577,6 @@ void tst_QDirModel::unreadable() void tst_QDirModel::filePath() { -#ifdef Q_OS_SYMBIAN - QSKIP("OS doesn't support symbolic links", SkipAll); -#else QFile::remove(SRCDIR "test.lnk"); QVERIFY(QFile(SRCDIR "tst_qdirmodel.cpp").link(SRCDIR "test.lnk")); QDirModel model; @@ -601,7 +592,6 @@ void tst_QDirModel::filePath() model.setResolveSymlinks(true); QCOMPARE(model.filePath(index), path + QString( "tst_qdirmodel.cpp")); QFile::remove(SRCDIR "test.lnk"); -#endif } void tst_QDirModel::task196768_sorting() @@ -629,10 +619,6 @@ void tst_QDirModel::task196768_sorting() view.setSortingEnabled(true); index2 = model.index(path); -#ifdef Q_OS_SYMBIAN - if(!RProcess().HasCapability(ECapabilityAllFiles)) - QEXPECT_FAIL("", "QTBUG-9746", Continue); -#endif QCOMPARE(index.data(), index2.data()); } |