diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-04 14:48:26 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-06 01:28:01 +0200 |
| commit | c6ad1b0e1d930ab5e4d1835ae87524340541f2ee (patch) | |
| tree | a000a4e8a533daa7d4b7453bfe658e289d001cb2 /tests/auto/platformquirks.h | |
| parent | 1fad83bac6d8606296588a688862f3883ea6f0d1 (diff) | |
Remove last remnants of Maemo 5 from autotests
Change-Id: I69bc9a3fc5ec4f7f9b927919ca7627a8a1e61700
Reviewed-on: http://codereview.qt-project.org/5951
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/platformquirks.h')
| -rw-r--r-- | tests/auto/platformquirks.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/tests/auto/platformquirks.h b/tests/auto/platformquirks.h index 2c16578914..bf2f843502 100644 --- a/tests/auto/platformquirks.h +++ b/tests/auto/platformquirks.h @@ -67,9 +67,7 @@ struct PlatformQuirks */ static inline bool isImageLoaderImprecise() { -#ifdef Q_WS_MAEMO_5 - return true; -#elif defined(Q_WS_X11) +#if defined(Q_WS_X11) // ### this is a very bad assumption, we should really check the version of libjpeg return X11->desktopEnvironment == DE_MEEGO_COMPOSITOR; #else @@ -82,9 +80,7 @@ struct PlatformQuirks */ static inline bool isAutoMaximizing() { -#ifdef Q_WS_MAEMO_5 - return true; -#elif defined(Q_WS_X11) +#if defined(Q_WS_X11) return X11->desktopEnvironment == DE_MEEGO_COMPOSITOR; #else return false; @@ -93,9 +89,7 @@ struct PlatformQuirks static inline bool haveMouseCursor() { -#ifdef Q_WS_MAEMO_5 - return false; -#elif defined(Q_WS_X11) +#if defined(Q_WS_X11) return X11->desktopEnvironment != DE_MEEGO_COMPOSITOR; #else return true; @@ -106,9 +100,6 @@ struct PlatformQuirks The autotests have to know which fileType is the default on the system*/ static inline MediaFileTypes defaultMediaFileType() { -#ifdef Q_WS_MAEMO_5 - return PlatformQuirks::mp3; -#endif #ifdef Q_WS_X11 // ### very bad assumption if (X11->desktopEnvironment == DE_MEEGO_COMPOSITOR) |