diff options
| author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-05-19 13:46:04 (GMT) |
|---|---|---|
| committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-05-19 13:46:04 (GMT) |
| commit | 40fc74c780be1069ed6e7f8cf7e4ac3c70d4c20c (patch) | |
| tree | 3f7467b1a75bb2564c4c1ca3261cf8027b96968b /src/testlib/qtest_global.h | |
| parent | 3cfd4e97aa8f5e8c7b9eda9d7847b3f236d3efb5 (diff) | |
| parent | d7fda9c7aef17ed79fd656f197fb179acb4ec54a (diff) | |
| download | Qt-40fc74c780be1069ed6e7f8cf7e4ac3c70d4c20c.zip Qt-40fc74c780be1069ed6e7f8cf7e4ac3c70d4c20c.tar.gz Qt-40fc74c780be1069ed6e7f8cf7e4ac3c70d4c20c.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into softkeys
Diffstat (limited to 'src/testlib/qtest_global.h')
| -rw-r--r-- | src/testlib/qtest_global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/testlib/qtest_global.h b/src/testlib/qtest_global.h index ebfdae1..ba7da2a 100644 --- a/src/testlib/qtest_global.h +++ b/src/testlib/qtest_global.h @@ -52,7 +52,7 @@ QT_MODULE(Test) #ifdef QTEST_EMBED # define Q_TESTLIB_EXPORT -#elif !defined(QT_SHARED) +#elif !defined(QT_SHARED) && !(defined(Q_OS_SYMBIAN) && defined(Q_CC_RVCT)) # define Q_TESTLIB_EXPORT #else # ifdef QTESTLIB_MAKEDLL @@ -64,7 +64,7 @@ QT_MODULE(Test) #if (defined (Q_CC_MSVC) && _MSC_VER < 1310) || defined (Q_CC_SUN) || defined (Q_CC_XLC) || (defined (Q_CC_GNU) && (__GNUC__ - 0 < 3)) || defined (Q_CC_NOKIAX86) # define QTEST_NO_SPECIALIZATIONS -#endif +#endif #if (defined Q_CC_HPACC) && (defined __ia64) |