From 5432f2c7a1ff02e1ee0e07e442ceb6c12ca66098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 3 Feb 2015 14:09:23 +0100 Subject: Remove traces of the Maemo platform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6b551de331aa0386ea53d8e96f50b669777d2d69 Reviewed-by: Friedemann Kleint Reviewed-by: Marc Mutz Reviewed-by: Tor Arne Vestbø --- tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp | 2 +- tests/manual/bearerex/bearerex.h | 5 ----- tests/manual/bearerex/bearerex.pro | 12 +++--------- 3 files changed, 4 insertions(+), 15 deletions(-) (limited to 'tests') diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp index 3dfb08406f..4e3d45829b 100644 --- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp +++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp @@ -768,7 +768,7 @@ void tst_QSplitter::task169702_sizes() QTest::qWait(100); testW->m_iFactor++; testW->updateGeometry(); - QTest::qWait(500);//100 is too fast for Maemo + QTest::qWait(500); //Make sure the minimimSizeHint is respected QCOMPARE(testW->size().height(), testW->minimumSizeHint().height()); diff --git a/tests/manual/bearerex/bearerex.h b/tests/manual/bearerex/bearerex.h index 3666917402..f0aefa686f 100644 --- a/tests/manual/bearerex/bearerex.h +++ b/tests/manual/bearerex/bearerex.h @@ -38,13 +38,8 @@ #include "ui_detailedinfodialog.h" -#if defined(Q_DEAD_CODE_FROM_QT4_MAEMO_6) -#include "ui_bearerex_maemo.h" -#include "ui_sessiondialog_maemo.h" -#else #include "ui_bearerex.h" #include "ui_sessiondialog.h" -#endif #include "qnetworkconfigmanager.h" #include "qnetworksession.h" #include "datatransferer.h" diff --git a/tests/manual/bearerex/bearerex.pro b/tests/manual/bearerex/bearerex.pro index 57b82a0b51..8f0af52b40 100644 --- a/tests/manual/bearerex/bearerex.pro +++ b/tests/manual/bearerex/bearerex.pro @@ -6,15 +6,9 @@ QT += core \ widgets \ network -FORMS += detailedinfodialog.ui -maemo5|maemo6 { - FORMS += sessiondialog_maemo.ui \ - bearerex_maemo.ui -} else { - FORMS += sessiondialog.ui \ - bearerex.ui -} - +FORMS += detailedinfodialog.ui \ + sessiondialog.ui \ + bearerex.ui # Example headers and sources HEADERS += bearerex.h \ -- cgit v1.2.3