summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/collections/tst_collections.cpp4
-rw-r--r--tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp5
-rw-r--r--tests/auto/qcombobox/tst_qcombobox.cpp6
-rw-r--r--tests/auto/qdialog/tst_qdialog.cpp19
-rw-r--r--tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp2
-rw-r--r--tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp8
-rw-r--r--tests/auto/qmessagebox/tst_qmessagebox.cpp9
-rw-r--r--tests/auto/qs60mainapplication/qs60mainapplication.pro2
-rw-r--r--tests/auto/qs60mainapplication/tst_qs60mainapplication.cpp133
-rw-r--r--tests/auto/qstyle/tst_qstyle.cpp51
-rw-r--r--tests/auto/qwidget/tst_qwidget.cpp47
-rw-r--r--tests/auto/qwindowsurface/tst_qwindowsurface.cpp2
-rw-r--r--tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp8
-rw-r--r--tests/manual/keypadnavigation/main.cpp4
14 files changed, 15 insertions, 285 deletions
diff --git a/tests/auto/collections/tst_collections.cpp b/tests/auto/collections/tst_collections.cpp
index 80779484c5..f09ff06234 100644
--- a/tests/auto/collections/tst_collections.cpp
+++ b/tests/auto/collections/tst_collections.cpp
@@ -3394,11 +3394,7 @@ void tst_Collections::forwardDeclared()
{ typedef QMultiHash<Key1, T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) }
{ typedef QMap<Key1, T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) }
{ typedef QMultiMap<Key1, T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) }
-#if !defined(Q_CC_RVCT)
- // RVCT can't handle forward declared template parameters if those are used to declare
- // class members inside templated class.
{ typedef QPair<T1, T2> C; C *x = 0; Q_UNUSED(x) }
-#endif
{ typedef QList<T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) }
{ typedef QLinkedList<T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) }
{ typedef QVector<T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) Q_UNUSED(i) Q_UNUSED(j) }
diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
index e7a484365a..0a2a20a29b 100644
--- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
+++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
@@ -350,9 +350,6 @@ void tst_QKeySequence::standardKeys_data()
QTest::newRow("forward") << (int)QKeySequence::Forward << QString("CTRL+]");
QTest::newRow("backward") << (int)QKeySequence::Back << QString("CTRL+[");
QTest::newRow("SelectEndOfDocument") << (int)QKeySequence::SelectEndOfDocument<< QString("CTRL+SHIFT+DOWN"); //mac only
-#elif defined(Q_WS_S60)
- QTest::newRow("help") << (int)QKeySequence::HelpContents<< QString("F2");
- QTest::newRow("SelectEndOfDocument") << (int)QKeySequence::SelectEndOfDocument<< QString("CTRL+SHIFT+END"); //mac only
#else
QTest::newRow("help") << (int)QKeySequence::HelpContents<< QString("F1");
QTest::newRow("nextChild") << (int)QKeySequence::NextChild<< QString("CTRL+Tab");
@@ -377,7 +374,7 @@ void tst_QKeySequence::keyBindings()
{
QList<QKeySequence> bindings = QKeySequence::keyBindings(QKeySequence::Copy);
QList<QKeySequence> expected;
-#if defined(Q_WS_MAC) || defined (Q_WS_S60)
+#if defined(Q_WS_MAC)
expected << QKeySequence("CTRL+C");
#elif defined Q_WS_X11
expected << QKeySequence("CTRL+C") << QKeySequence("F16") << QKeySequence("CTRL+INSERT");
diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp
index e5ff7e9763..042240164a 100644
--- a/tests/auto/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/qcombobox/tst_qcombobox.cpp
@@ -1938,13 +1938,7 @@ void tst_QComboBox::itemListPosition()
combo.showPopup();
QTRY_VERIFY(combo.view());
QTRY_VERIFY(combo.view()->isVisible());
-
-#if defined(Q_WS_S60)
- // Assuming that QtS60 style is used, here. But other ones would certainly also fail
- QEXPECT_FAIL("", "QtS60Style does not yet position the combobox popup correctly", Continue);
-#endif
QVERIFY( combo.view()->window()->x() + combo.view()->window()->width() <= screen.x() + screen.width() );
-
}
void tst_QComboBox::separatorItem_data()
diff --git a/tests/auto/qdialog/tst_qdialog.cpp b/tests/auto/qdialog/tst_qdialog.cpp
index 0f3f27446d..5672ce5e68 100644
--- a/tests/auto/qdialog/tst_qdialog.cpp
+++ b/tests/auto/qdialog/tst_qdialog.cpp
@@ -203,33 +203,14 @@ void tst_QDialog::showExtension()
QCOMPARE( testWidget->size(), dlgSize );
QPoint oldPosition = testWidget->pos();
-#ifdef Q_WS_S60
- const int htDiff = ext->size().height() - testWidget->size().height();
-#endif
// show
((DummyDialog*)testWidget)->showExtension( TRUE );
// while ( testWidget->size() == dlgSize )
// qApp->processEvents();
-#ifdef Q_WS_S60
- QPoint expectedPosition;
- if (!horizontal) {
- expectedPosition = QPoint(0, oldPosition.y() - extSize.height());
- } else {
- if (htDiff>0)
- expectedPosition = QPoint(0, oldPosition.y() - htDiff);
- else
- expectedPosition = oldPosition;
- }
-#endif
-
QTEST( testWidget->size(), "result" );
-#ifdef Q_WS_S60
- QCOMPARE(testWidget->pos(), expectedPosition);
-#else
QCOMPARE(testWidget->pos(), oldPosition);
-#endif
// hide extension. back to old size ?
((DummyDialog*)testWidget)->showExtension( FALSE );
diff --git a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
index 81d2fa6ca7..2891efa2bd 100644
--- a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
+++ b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
@@ -152,7 +152,7 @@ void tst_QGraphicsLinearLayout::initTestCase()
{
// since the style will influence the results, we have to ensure
// that the tests are run using the same style on all platforms
-#if defined( Q_WS_S60 )|| defined (Q_WS_WINCE)
+#if defined (Q_WS_WINCE)
QApplication::setStyle(new QWindowsStyle);
#else
QApplication::setStyle(new QPlastiqueStyle);
diff --git a/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp b/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
index 0b223c62eb..61a107da05 100644
--- a/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
+++ b/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
@@ -226,15 +226,7 @@ void tst_QGraphicsSceneIndex::connectedToSceneRectChanged()
class MyScene : public QGraphicsScene
{
public:
-#ifdef Q_CC_RVCT
- //using keyword doesn't change visibility to public in RVCT2.2 compiler
- inline int receivers(const char* signal) const
- {
- return QGraphicsScene::receivers(signal);
- }
-#else
using QGraphicsScene::receivers;
-#endif
};
MyScene scene; // Uses QGraphicsSceneBspTreeIndex by default.
diff --git a/tests/auto/qmessagebox/tst_qmessagebox.cpp b/tests/auto/qmessagebox/tst_qmessagebox.cpp
index 463d4c4f82..ac33efc564 100644
--- a/tests/auto/qmessagebox/tst_qmessagebox.cpp
+++ b/tests/auto/qmessagebox/tst_qmessagebox.cpp
@@ -640,13 +640,7 @@ void tst_QMessageBox::incorrectDefaultButton()
void tst_QMessageBox::updateSize()
{
QMessageBox box;
-#ifdef Q_WS_S60
- // In S60 messagebox is always occupies maximum width, i.e. screen width
- // so we need to have long enough text to split over several line
- box.setText("This is awesome long text");
-#else
box.setText("This is awesome");
-#endif
box.show();
QSize oldSize = box.size();
QString longText;
@@ -656,12 +650,9 @@ void tst_QMessageBox::updateSize()
QVERIFY(box.size() != oldSize); // should have grown
QVERIFY(box.width() > oldSize.width() || box.height() > oldSize.height());
oldSize = box.size();
-#ifndef Q_WS_S60
- // In S60 dialogs buttons are in softkey area -> message box size does not change
box.setStandardButtons(QMessageBox::StandardButtons(0xFFFF));
QVERIFY(box.size() != oldSize); // should have grown
QVERIFY(box.width() > oldSize.width() || box.height() > oldSize.height());
-#endif
}
void tst_QMessageBox::setInformativeText()
diff --git a/tests/auto/qs60mainapplication/qs60mainapplication.pro b/tests/auto/qs60mainapplication/qs60mainapplication.pro
deleted file mode 100644
index e0841b842e..0000000000
--- a/tests/auto/qs60mainapplication/qs60mainapplication.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-load(qttest_p4)
-SOURCES += tst_qs60mainapplication.cpp
diff --git a/tests/auto/qs60mainapplication/tst_qs60mainapplication.cpp b/tests/auto/qs60mainapplication/tst_qs60mainapplication.cpp
deleted file mode 100644
index 069fd14d58..0000000000
--- a/tests/auto/qs60mainapplication/tst_qs60mainapplication.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include <QtTest/QtTest>
-#include <QtGui/QS60MainApplication>
-#include <QtGui/QS60MainDocument>
-#include <QtGui/QS60MainAppUi>
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
-class tst_QS60MainApplication : public QObject
-{
- Q_OBJECT
-
-public slots:
- void initTestCase();
- void cleanupTestCase();
- void init();
- void cleanup();
-private slots:
- void customQS60MainApplication();
-};
-
-void tst_QS60MainApplication::initTestCase()
-{
-}
-
-void tst_QS60MainApplication::cleanupTestCase()
-{
-}
-
-void tst_QS60MainApplication::init()
-{
-}
-
-void tst_QS60MainApplication::cleanup()
-{
-}
-
-#ifdef Q_WS_S60
-bool appUiConstructed = false;
-
-class CustomMainAppUi : public QS60MainAppUi
-{
-public:
- CustomMainAppUi()
- {
- appUiConstructed = true;
- }
-};
-
-class CustomMainDocument : public QS60MainDocument
-{
-public:
- CustomMainDocument(CEikApplication &eikApp)
- : QS60MainDocument(eikApp)
- {
- }
- CEikAppUi *CreateAppUiL()
- {
- return new (ELeave) CustomMainAppUi;
- }
-};
-
-class CustomMainApplication : public QS60MainApplication
-{
-protected:
- CApaDocument *CreateDocumentL()
- {
- return new (ELeave) CustomMainDocument(*this);
- }
-};
-
-CApaApplication *factory()
-{
- return new (ELeave) CustomMainApplication;
-}
-#endif // Q_WS_S60
-
-void tst_QS60MainApplication::customQS60MainApplication()
-{
-#ifndef Q_WS_S60
- QSKIP("This is an S60-only test", SkipAll);
-#else
- int argc = 1;
- char *argv = "tst_qs60mainapplication";
- QApplication app(factory, argc, &argv);
- QVERIFY(appUiConstructed);
-#endif
-}
-
-QTEST_APPLESS_MAIN(tst_QS60MainApplication)
-#include "tst_qs60mainapplication.moc"
diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp
index 0f04b734dc..ba6d71b41d 100644
--- a/tests/auto/qstyle/tst_qstyle.cpp
+++ b/tests/auto/qstyle/tst_qstyle.cpp
@@ -102,14 +102,10 @@ static bool qt_wince_is_smartphone() {
}
#endif
-#ifdef Q_WS_S60
-#include <qs60style.h>
-#endif
-
#include <qwidget.h>
//TESTED_CLASS=
-//TESTED_FILES=gui/styles/qstyle.h gui/styles/qstyle.cpp gui/styles/qplastiquestyle.cpp gui/styles/qwindowsstyle.cpp gui/styles/qwindowsxpstyle.cpp gui/styles/qwindowsvistastyle.cpp gui/styles/qmotifstyle.cpp gui/styles/qs60style.cpp
+//TESTED_FILES=gui/styles/qstyle.h gui/styles/qstyle.cpp gui/styles/qplastiquestyle.cpp gui/styles/qwindowsstyle.cpp gui/styles/qwindowsxpstyle.cpp gui/styles/qwindowsvistastyle.cpp gui/styles/qmotifstyle.cpp
class tst_QStyle : public QObject
{
@@ -147,11 +143,12 @@ private slots:
void testMacStyle();
void testWindowsCEStyle();
void testWindowsMobileStyle();
- void testS60Style();
void testStyleFactory();
void testProxyStyle();
void pixelMetric();
+#if !defined(QT_NO_STYLE_PLASTIQUE) && !defined(QT_NO_STYLE_WINDOWS)
void progressBarChangeStyle();
+#endif
void defaultFont();
void testDrawingShortcuts();
private:
@@ -376,12 +373,6 @@ void tst_QStyle::testScrollBarSubControls(QStyle* style)
scrollBar.show();
const QStyleOptionSlider opt = qt_qscrollbarStyleOption(&scrollBar);
foreach (int subControl, QList<int>() << 1 << 2 << 4 << 8) {
-
-#ifdef Q_WS_S60
-// in s60style add line and sub line have been removed.
- if (subControl == QStyle::SC_ScrollBarAddLine || subControl == QStyle::SC_ScrollBarSubLine )
- continue;
-#endif
QRect sr = testWidget->style()->subControlRect(QStyle::CC_ScrollBar, &opt,
QStyle::SubControl(subControl), &scrollBar);
QVERIFY(sr.isNull() == false);
@@ -606,16 +597,6 @@ void tst_QStyle::testWindowsMobileStyle()
#endif
}
-void tst_QStyle::testS60Style()
- {
-#if defined(Q_WS_S60)
- QS60Style cstyle;
- testAllFunctions(&cstyle);
-#else
- QSKIP("No S60Style style", SkipAll);
-#endif
- }
-
// Helper class...
MyWidget::MyWidget( QWidget* parent, const char* name )
@@ -697,9 +678,9 @@ void tst_QStyle::pixelMetric()
delete style;
}
+#if !defined(QT_NO_STYLE_PLASTIQUE) && !defined(QT_NO_STYLE_WINDOWS)
void tst_QStyle::progressBarChangeStyle()
{
-#if !defined(QT_NO_STYLE_PLASTIQUE) && !defined(QT_NO_STYLE_WINDOWS)
//test a crashing situation (task 143530)
//where changing the styles and deleting a progressbar would crash
@@ -719,30 +700,8 @@ void tst_QStyle::progressBarChangeStyle()
QTest::qWait(100);
//before the correction, there would be a crash here
-#elif !defined(QT_NO_STYLE_S60) && !defined(QT_NO_STYLE_WINDOWS)
- //test a crashing situation (task 143530)
- //where changing the styles and deleting a progressbar would crash
-
- QWindowsStyle style1;
- QS60Style style2;
-
- QProgressBar *progress=new QProgressBar;
- progress->setStyle(&style1);
-
- progress->show();
-
- progress->setStyle(&style2);
-
- QTest::qWait(100);
- delete progress;
-
- QTest::qWait(100);
-
- //before the correction, there would be a crash here
-#else
- QSKIP("Either style Plastique or Windows or S60 missing", SkipAll);
-#endif
}
+#endif
void tst_QStyle::lineUpLayoutTest(QStyle *style)
{
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index a44cacfaef..bbe62fbaa4 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -75,13 +75,6 @@
#include "../../shared/util.h"
-
-#ifdef Q_WS_S60
-#include <avkon.hrh> // EEikStatusPaneUidTitle
-#include <akntitle.h> // CAknTitlePane
-#include <akncontext.h> // CAknContextPane
-#endif
-
#ifdef Q_WS_QWS
# include <qscreen_qws.h>
#endif
@@ -1772,9 +1765,6 @@ void tst_QWidget::windowState()
pos = QPoint(10,10);
size = QSize(100,100);
}
-#elif defined(Q_WS_S60)
- QPoint pos = QPoint(10,10);
- QSize size = QSize(100,100);
#else
const QPoint pos(500, 500);
const QSize size(200, 200);
@@ -1915,7 +1905,7 @@ void tst_QWidget::showMaximized()
layouted.showNormal();
QVERIFY(!(layouted.windowState() & Qt::WindowMaximized));
-#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) && !defined(Q_WS_S60) && !defined(Q_WS_QPA)
+#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) && !defined(Q_WS_QPA)
//embedded may choose a different size to fit on the screen.
QCOMPARE(layouted.size(), layouted.sizeHint());
#endif
@@ -1992,7 +1982,7 @@ void tst_QWidget::showFullScreen()
layouted.showNormal();
QVERIFY(!(layouted.windowState() & Qt::WindowFullScreen));
-#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) && !defined (Q_WS_S60) && !defined(Q_WS_QPA)
+#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) && !defined(Q_WS_QPA)
//embedded may choose a different size to fit on the screen.
QCOMPARE(layouted.size(), layouted.sizeHint());
#endif
@@ -3345,35 +3335,6 @@ QString textPropertyToString(Display *display, XTextProperty& text_prop)
}
return ret;
}
-
-#endif
-
-#if defined(Q_WS_S60)
-// Returns the application's status pane control, if not present returns NULL.
-static CCoeControl* GetStatusPaneControl( TInt aPaneId )
-{
- const TUid paneUid = { aPaneId };
-
- CEikStatusPane* statusPane = CEikonEnv::Static()->AppUiFactory()->StatusPane();
- if (statusPane && statusPane->PaneCapabilities(paneUid).IsPresent()){
- CCoeControl* control = NULL;
- // ControlL shouldn't leave because the pane is present
- TRAPD(err, control = statusPane->ControlL(paneUid));
- return err != KErrNone ? NULL : control;
- }
- return NULL;
-}
-// Returns the application's title pane, if not present returns NULL.
-static CAknTitlePane* TitlePane()
-{
- return static_cast<CAknTitlePane*>(GetStatusPaneControl(EEikStatusPaneUidTitle));
-}
-
-// Returns the application's title pane, if not present returns NULL.
-static CAknContextPane* ContextPane()
-{
- return static_cast<CAknContextPane*>(GetStatusPaneControl(EEikStatusPaneUidContext));
-}
#endif
void tst_QWidget::task110173()
@@ -7142,7 +7103,7 @@ void tst_QWidget::repaintWhenChildDeleted()
}
#endif
ColorWidget w(0, Qt::red);
-#if !defined(Q_OS_WINCE) && !defined(Q_WS_S60)
+#if !defined(Q_OS_WINCE)
QPoint startPoint = QApplication::desktop()->availableGeometry(&w).topLeft();
startPoint.rx() += 50;
startPoint.ry() += 50;
@@ -7174,7 +7135,7 @@ void tst_QWidget::repaintWhenChildDeleted()
void tst_QWidget::hideOpaqueChildWhileHidden()
{
ColorWidget w(0, Qt::red);
-#if !defined(Q_OS_WINCE) && !defined(Q_WS_S60)
+#if !defined(Q_OS_WINCE)
QPoint startPoint = QApplication::desktop()->availableGeometry(&w).topLeft();
startPoint.rx() += 50;
startPoint.ry() += 50;
diff --git a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
index 11348e9162..5fdd273008 100644
--- a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
+++ b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
@@ -174,8 +174,6 @@ void tst_QWindowSurface::flushOutsidePaintEvent()
QApplication::processEvents();
#if defined(Q_WS_QWS)
QApplication::sendPostedEvents(); //for the glib event loop
-#elif defined(Q_WS_S60)
- QTest::qWait(5000);
#endif
VERIFY_COLOR(w.geometry(), w.color);
w.reset();
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index 2380ed3e6c..7475de1f0c 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -53,8 +53,8 @@ public:
~tst_QGraphicsAnchorLayout() {}
private slots:
- void s60_hard_complex_data();
- void s60_hard_complex();
+ void hard_complex_data();
+ void hard_complex();
void linearVsAnchorSizeHints_data();
void linearVsAnchorSizeHints();
void linearVsAnchorSetGeometry_data();
@@ -103,7 +103,7 @@ static void setAnchor(QGraphicsAnchorLayout *l,
anchor->setSpacing(spacing);
}
-void tst_QGraphicsAnchorLayout::s60_hard_complex_data()
+void tst_QGraphicsAnchorLayout::hard_complex_data()
{
QTest::addColumn<int>("whichSizeHint");
QTest::newRow("minimumSizeHint")
@@ -117,7 +117,7 @@ void tst_QGraphicsAnchorLayout::s60_hard_complex_data()
<< -1;
}
-void tst_QGraphicsAnchorLayout::s60_hard_complex()
+void tst_QGraphicsAnchorLayout::hard_complex()
{
QFETCH(int, whichSizeHint);
diff --git a/tests/manual/keypadnavigation/main.cpp b/tests/manual/keypadnavigation/main.cpp
index 27989e0325..f8debafe56 100644
--- a/tests/manual/keypadnavigation/main.cpp
+++ b/tests/manual/keypadnavigation/main.cpp
@@ -179,11 +179,7 @@ int main(int argc, char *argv[])
{
QApplication a(argc, argv);
KeypadNavigation w;
-#ifdef Q_WS_S60
- w.showMaximized();
-#else
w.show();
-#endif
return a.exec();
}