Remove Symbian-only test function.
Change-Id: I817c234a6104a072f131c17e9492c68d79ca5f8d Reviewed-on: http://codereview.qt-project.org/5943 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
parent
7cfad460c5
commit
3f88da82b1
@ -110,7 +110,6 @@ private slots:
|
||||
void testSignalOrder();
|
||||
void testDefaultButton_data();
|
||||
void testDefaultButton();
|
||||
void testS60SoftKeys();
|
||||
#ifdef QT_SOFTKEYS_ENABLED
|
||||
void testSoftKeyReparenting();
|
||||
#endif
|
||||
@ -731,32 +730,6 @@ static int softKeyCount(QWidget *widget)
|
||||
return softkeyCount;
|
||||
}
|
||||
|
||||
void tst_QDialogButtonBox::testS60SoftKeys()
|
||||
{
|
||||
#ifdef Q_WS_S60
|
||||
QDialog dialog(0);
|
||||
QDialogButtonBox buttonBox(&dialog);
|
||||
buttonBox.setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
|
||||
dialog.show();
|
||||
|
||||
#ifndef QT_NO_ACTION
|
||||
QCOMPARE( softKeyCount(&dialog), 2);
|
||||
#endif
|
||||
|
||||
QDialog dialog2(0);
|
||||
QDialogButtonBox buttonBox2(&dialog2);
|
||||
buttonBox2.setStandardButtons(QDialogButtonBox::Cancel);
|
||||
dialog2.show();
|
||||
|
||||
#ifndef QT_NO_ACTION
|
||||
QCOMPARE( softKeyCount(&dialog2), 1);
|
||||
#endif
|
||||
|
||||
#else
|
||||
QSKIP("S60-specific test", SkipAll );
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef QT_SOFTKEYS_ENABLED
|
||||
void tst_QDialogButtonBox::testSoftKeyReparenting()
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user