AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove last remnants of Maemo 5 from autotests

Browse Source 
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>
This commit is contained in:
Jason McDonald 2011-10-04 14:48:26 +10:00 committed by Qt by Nokia
parent 1fad83bac6
commit c6ad1b0e1d
4 changed files with 12 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/auto/platformquirks.h
View File

@ -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)

7
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
View File

@ -1111,10 +1111,6 @@ void tst_QGraphicsWidget::initStyleOption_data()
// void initStyleOption(QStyleOption* option) const public
void tst_QGraphicsWidget::initStyleOption()
{
#ifdef Q_WS_MAEMO_5
QSKIP("The test passes, but it doesn't work when the display is in energy saving mode", SkipAll);
#endif
QGraphicsScene scene;
QGraphicsView view(&scene);
view.show();
@ -1777,9 +1773,6 @@ void tst_QGraphicsWidget::verifyFocusChain()
void tst_QGraphicsWidget::updateFocusChainWhenChildDie()
{
#ifdef Q_WS_MAEMO_5
QSKIP("On Maemo 5 the Display Manager is shown on Window change, so the test won't work", SkipAll);
#endif
QGraphicsScene scene;
QGraphicsView view(&scene);
view.show();

28
tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp
View File

@ -321,17 +321,11 @@ void tst_GraphicsViewBenchmark::initTestCase()
if (mSettings->size().width() > 0 && mSettings->size().height() > 0) {
mMainView->resize(mSettings->size().width(), mSettings->size().height());
mMainView->show();
} else {
#if defined(Q_WS_MAEMO_5)
} else if (QApplication::desktop()->width() < 360 || QApplication::desktop()->height() < 640) {
mMainView->showFullScreen();
#else
if (QApplication::desktop()->width() < 360 || QApplication::desktop()->height() < 640) {
mMainView->showFullScreen();
} else {
mMainView->resize(360, 640);
mMainView->show();
}
#endif
} else {
mMainView->resize(360, 640);
mMainView->show();
}
mDataGenerator.Reset();
@ -779,17 +773,11 @@ int main(int argc, char *argv[])
if (settings.size().width() > 0 && settings.size().height() > 0) {
view.resize(settings.size().width(), settings.size().height());
view.show();
} else {
#if defined(Q_WS_MAEMO_5)
} else if (QApplication::desktop()->width() < 360 || QApplication::desktop()->height() < 640) {
view.showFullScreen();
#else
if (QApplication::desktop()->width() < 360 || QApplication::desktop()->height() < 640) {
view.showFullScreen();
} else {
view.resize(360, 640);
view.show();
}
#endif
} else {
view.resize(360, 640);
view.show();
}
returnValue = app.exec();
} else {

2
tests/manual/bearerex/bearerex.h
View File

@ -46,7 +46,7 @@
#include "ui_detailedinfodialog.h"
#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
#if defined(Q_WS_MAEMO_6)
#include "ui_bearerex_maemo.h"
#include "ui_sessiondialog_maemo.h"
#else