diff options
author | Xizhi Zhu <xizhi.zhu@gmail.com> | 2012-01-23 21:25:30 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 07:08:31 +0100 |
commit | ba9302b8a9b6b50f37987261c1ade9af2ade2d3c (patch) | |
tree | 5ca4d3d9b963b5b1afc40b396c773e90072f0818 /tests | |
parent | d1a2b53aaf76f48e195260a415ca406fa1ef01a2 (diff) |
Remove Symbian specific code from qtbase.
Change-Id: I27d37d914b71e1e43c94e2a975ffec49e1ecd456
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/corelib/io/qdir/tst_qdir.cpp | 2 | ||||
-rw-r--r-- | tests/auto/network/ssl/qsslkey/qsslkey.pro | 1 | ||||
-rw-r--r-- | tests/auto/widgets/util/util.pro | 4 | ||||
-rw-r--r-- | tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp | 21 | ||||
-rw-r--r-- | tests/manual/qnetworkaccessmanager/qget/qget.pro | 3 |
5 files changed, 1 insertions, 30 deletions
diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp index 464e53d748..f1c9015092 100644 --- a/tests/auto/corelib/io/qdir/tst_qdir.cpp +++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp @@ -1848,8 +1848,6 @@ void tst_QDir::equalityOperator_data() //need a path in the root directory that is unlikely to be a symbolic link. #if defined (Q_OS_WIN) QString pathinroot("c:/windows/.."); -#elif defined (Q_OS_SYMBIAN) - QString pathinroot("c:/data/.."); #else QString pathinroot("/sbin/.."); #endif diff --git a/tests/auto/network/ssl/qsslkey/qsslkey.pro b/tests/auto/network/ssl/qsslkey/qsslkey.pro index d882362290..4af35487cd 100644 --- a/tests/auto/network/ssl/qsslkey/qsslkey.pro +++ b/tests/auto/network/ssl/qsslkey/qsslkey.pro @@ -25,5 +25,4 @@ wince* { DEFINES += SRCDIR=\\\".\\\" } else { DEFINES+= SRCDIR=\\\"$$PWD\\\" - TARGET.CAPABILITY = NetworkServices } diff --git a/tests/auto/widgets/util/util.pro b/tests/auto/widgets/util/util.pro index b7fe35ce4c..33f2845001 100644 --- a/tests/auto/widgets/util/util.pro +++ b/tests/auto/widgets/util/util.pro @@ -5,7 +5,3 @@ SUBDIRS=\ qsystemtrayicon \ qundogroup \ qundostack \ - -symbian:SUBDIRS -= \ - qsystemtrayicon \ - diff --git a/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp b/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp index 31783a4431..12420e25a1 100644 --- a/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp +++ b/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp @@ -44,26 +44,7 @@ #include <math.h> -#ifdef Q_OS_SYMBIAN -# include <e32std.h> -typedef RMutex NativeMutexType; -void NativeMutexInitialize(NativeMutexType *mutex) -{ - mutex->CreateLocal(); -} -void NativeMutexDestroy(NativeMutexType *mutex) -{ - mutex->Close(); -} -void NativeMutexLock(NativeMutexType *mutex) -{ - mutex->Wait(); -} -void NativeMutexUnlock(NativeMutexType *mutex) -{ - mutex->Signal(); -} -#elif defined(Q_OS_UNIX) +#if defined(Q_OS_UNIX) # include <pthread.h> # include <errno.h> typedef pthread_mutex_t NativeMutexType; diff --git a/tests/manual/qnetworkaccessmanager/qget/qget.pro b/tests/manual/qnetworkaccessmanager/qget/qget.pro index 80af8a556f..341f772b51 100644 --- a/tests/manual/qnetworkaccessmanager/qget/qget.pro +++ b/tests/manual/qnetworkaccessmanager/qget/qget.pro @@ -5,6 +5,3 @@ CONFIG += console # Input SOURCES += qget.cpp HEADERS += qget.h - -symbian: TARGET.CAPABILITY += ReadUserData NetworkServices - |