From 95cebd34ebc5b4d39b11dc91610309a35e488663 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 27 Sep 2011 19:53:01 +1000 Subject: Remove Symbian-specific code from tests. Symbian is not a supported platform for Qt5, so this code is no longer required. Change-Id: I1172e6a42d518490e63e9599bf10579df08259aa Reviewed-on: http://codereview.qt-project.org/5657 Reviewed-by: Rohan McGovern --- tests/manual/bearerex/bearerex.cpp | 6 +--- tests/manual/bearerex/bearerex.pro | 2 -- tests/manual/bearerex/main.cpp | 4 --- tests/manual/inputmethodhints/inputmethodhints.pro | 2 -- tests/manual/lance/lance.pro | 8 ----- .../tst_network_remote_stresstest.cpp | 2 +- .../network_stresstest/tst_network_stresstest.cpp | 6 ++-- tests/manual/qlocale/main.cpp | 4 --- tests/manual/socketengine/main.cpp | 34 ---------------------- tests/manual/socketengine/socketengine.pro | 2 -- tests/manual/textrendering/glyphshaping/main.cpp | 2 -- .../manual/textrendering/textperformance/main.cpp | 4 --- 12 files changed, 5 insertions(+), 71 deletions(-) (limited to 'tests/manual') diff --git a/tests/manual/bearerex/bearerex.cpp b/tests/manual/bearerex/bearerex.cpp index 68fe8b4f5b..c044476a8c 100644 --- a/tests/manual/bearerex/bearerex.cpp +++ b/tests/manual/bearerex/bearerex.cpp @@ -249,12 +249,8 @@ DetailedInfoDialog::DetailedInfoDialog(QNetworkConfiguration* apNetworkConfigura tableWidget->setItem(i+2, 1, new QTableWidgetItem(apNetworkConfiguration->children()[i].name())); } } - - tableWidget->setFocusPolicy(Qt::NoFocus); -#ifdef Q_OS_SYMBIAN - this->showMaximized(); -#endif + tableWidget->setFocusPolicy(Qt::NoFocus); } SessionTab::SessionTab(QNetworkConfiguration* apNetworkConfiguration, diff --git a/tests/manual/bearerex/bearerex.pro b/tests/manual/bearerex/bearerex.pro index 397261d0c6..123038dba4 100644 --- a/tests/manual/bearerex/bearerex.pro +++ b/tests/manual/bearerex/bearerex.pro @@ -24,5 +24,3 @@ SOURCES += bearerex.cpp \ main.cpp \ xqlistwidget.cpp \ datatransferer.cpp - -symbian:TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData WriteDeviceData ReadDeviceData diff --git a/tests/manual/bearerex/main.cpp b/tests/manual/bearerex/main.cpp index 39cedb80ad..9f3e9c68f4 100644 --- a/tests/manual/bearerex/main.cpp +++ b/tests/manual/bearerex/main.cpp @@ -47,11 +47,7 @@ int main(int argc, char* argv[]) { QApplication app(argc, argv); BearerEx bearerEx; -#ifdef Q_OS_SYMBIAN - bearerEx.showMaximized(); -#else bearerEx.show(); -#endif return app.exec(); } diff --git a/tests/manual/inputmethodhints/inputmethodhints.pro b/tests/manual/inputmethodhints/inputmethodhints.pro index 7298ec66e1..171c5f1772 100644 --- a/tests/manual/inputmethodhints/inputmethodhints.pro +++ b/tests/manual/inputmethodhints/inputmethodhints.pro @@ -9,5 +9,3 @@ SOURCES += main.cpp \ inputmethodhints.cpp FORMS += inputmethodhints.ui RESOURCES += - -symbian:TARGET.UID3 = 0xE4938ABC diff --git a/tests/manual/lance/lance.pro b/tests/manual/lance/lance.pro index a3fa27f77f..7eee7ec2de 100644 --- a/tests/manual/lance/lance.pro +++ b/tests/manual/lance/lance.pro @@ -16,11 +16,3 @@ RESOURCES += icons.qrc \ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl -symbian*: { - testData.files = $$QT_BUILD_TREE/tests/auto/lancelot/scripts - testData.path = . - DEPLOYMENT += testData -} - - - diff --git a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp index f934cd68dd..f35308d4c8 100644 --- a/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp +++ b/tests/manual/network_remote_stresstest/tst_network_remote_stresstest.cpp @@ -114,7 +114,7 @@ tst_NetworkRemoteStressTest::tst_NetworkRemoteStressTest() // IPv6 requires Winsock v2.0 or better. WSAStartup(MAKEWORD(2,0), &wsadata); -#elif defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) +#elif defined(Q_OS_UNIX) ::signal(SIGALRM, SIG_IGN); #endif diff --git a/tests/manual/network_stresstest/tst_network_stresstest.cpp b/tests/manual/network_stresstest/tst_network_stresstest.cpp index 6b51a2390a..2da83f09a7 100644 --- a/tests/manual/network_stresstest/tst_network_stresstest.cpp +++ b/tests/manual/network_stresstest/tst_network_stresstest.cpp @@ -118,7 +118,7 @@ tst_NetworkStressTest::tst_NetworkStressTest() // IPv6 requires Winsock v2.0 or better. WSAStartup(MAKEWORD(2,0), &wsadata); -#elif defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) +#elif defined(Q_OS_UNIX) ::signal(SIGALRM, SIG_IGN); #endif } @@ -224,7 +224,7 @@ void tst_NetworkStressTest::nativeBlockingConnectDisconnect() byteCounter = 0; timeout.start(); -#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) +#if defined(Q_OS_UNIX) alarm(10); #endif @@ -279,7 +279,7 @@ void tst_NetworkStressTest::nativeBlockingConnectDisconnect() } qDebug() << "Average transfer rate was" << (totalBytes / 1024.0 / 1024 * 1000 / outerTimer.elapsed()) << "MB/s"; -#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) +#if defined(Q_OS_UNIX) alarm(0); #endif } diff --git a/tests/manual/qlocale/main.cpp b/tests/manual/qlocale/main.cpp index c85bd191f3..b14a44f7c6 100644 --- a/tests/manual/qlocale/main.cpp +++ b/tests/manual/qlocale/main.cpp @@ -46,10 +46,6 @@ int main(int argv, char *args[]) { QApplication app(argv, args); Window window; -#if !defined(Q_OS_SYMBIAN) window.show(); -#else - window.showFullScreen(); -#endif return app.exec(); } diff --git a/tests/manual/socketengine/main.cpp b/tests/manual/socketengine/main.cpp index 8406a129e2..36c233a5c9 100644 --- a/tests/manual/socketengine/main.cpp +++ b/tests/manual/socketengine/main.cpp @@ -63,36 +63,6 @@ int main(int argc, char**argv) { QCoreApplication app(argc, argv); -#ifdef Q_OS_SYMBIAN - QNetworkConfigurationManager configurationManager; - QNetworkConfiguration configuration = configurationManager.defaultConfiguration(); - if (!configuration.isValid()) { - qDebug() << "Got an invalid session configuration"; - exit(1); - } - - qDebug() << "Opening session..."; - QNetworkSession *session = new QNetworkSession(configuration); - - // Does not work: -// session->open(); -// session->waitForOpened(); - - // works: - QEventLoop loop; - QObject::connect(session, SIGNAL(opened()), &loop, SLOT(quit()), Qt::QueuedConnection); - QMetaObject::invokeMethod(session, "open", Qt::QueuedConnection); - loop.exec(); - - - if (session->isOpen()) { - qDebug() << "session opened"; - } else { - qDebug() << "session could not be opened -" << session->errorString(); - exit(1); - } -#endif - // create it QAbstractSocketEngine *socketEngine = QAbstractSocketEngine::createSocketEngine(QAbstractSocket::TcpSocket, QNetworkProxy(QNetworkProxy::NoProxy), 0); @@ -131,11 +101,7 @@ int main(int argc, char**argv) bzero(buf, bufsize); ret = socketEngine->read(buf, available); if (ret > 0) { -#ifdef Q_OS_SYMBIAN - qDebug() << buf; //printf goes only to screen, this goes to remote debug channel -#else printf("%s", buf); -#endif } else { // some failure when reading exit(1); diff --git a/tests/manual/socketengine/socketengine.pro b/tests/manual/socketengine/socketengine.pro index 76a40be8e3..96d00555e4 100644 --- a/tests/manual/socketengine/socketengine.pro +++ b/tests/manual/socketengine/socketengine.pro @@ -9,7 +9,5 @@ QT += network CONFIG += release -symbian: TARGET.CAPABILITY = NetworkServices - # Input SOURCES += main.cpp diff --git a/tests/manual/textrendering/glyphshaping/main.cpp b/tests/manual/textrendering/glyphshaping/main.cpp index 7c09694868..a02373f1c8 100644 --- a/tests/manual/textrendering/glyphshaping/main.cpp +++ b/tests/manual/textrendering/glyphshaping/main.cpp @@ -167,8 +167,6 @@ bool dumpHtml(const QString &pathName) "Win32" #elif defined(Q_WS_X11) "X11" -#elif defined(Q_OS_SYMBIAN) - "Symbian" #else "" #endif diff --git a/tests/manual/textrendering/textperformance/main.cpp b/tests/manual/textrendering/textperformance/main.cpp index 6fed30946c..654aecde4a 100644 --- a/tests/manual/textrendering/textperformance/main.cpp +++ b/tests/manual/textrendering/textperformance/main.cpp @@ -219,11 +219,7 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); FontBlaster dlg; -#ifdef Q_OS_SYMBIAN - dlg.showFullScreen(); -#else dlg.show(); -#endif return a.exec(); } -- cgit v1.2.3