From 87274e272d2a854563066489e20d019b4e6320de Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 18 Oct 2011 09:54:31 +0200 Subject: QtBase examples: Remove Maemo/Symbian-specific code. - Maemo/Symbian are no longer supported and QWidget-based examples are no longer supposed to run on mobile platforms, so, remove any Maemo/Symbian or mobile-specific code from source files and profiles. - Remove Maemo/Symbian vibration examples. - Change Q_WS_MAC/WIN to Q_OS_MAC/WIN where appropriate. Reviewed-by: Casper van Donderen Change-Id: I488a0adadb98934567aa6416206a80465c9c3a81 Reviewed-by: Friedemann Kleint Reviewed-by: Casper van Donderen --- examples/network/threadedfortuneserver/dialog.cpp | 14 -------------- examples/network/threadedfortuneserver/main.cpp | 4 ---- .../threadedfortuneserver/threadedfortuneserver.pro | 7 ------- 3 files changed, 25 deletions(-) (limited to 'examples/network/threadedfortuneserver') diff --git a/examples/network/threadedfortuneserver/dialog.cpp b/examples/network/threadedfortuneserver/dialog.cpp index e62076130d..2340a6bc5a 100644 --- a/examples/network/threadedfortuneserver/dialog.cpp +++ b/examples/network/threadedfortuneserver/dialog.cpp @@ -51,14 +51,8 @@ Dialog::Dialog(QWidget *parent) { statusLabel = new QLabel; statusLabel->setWordWrap(true); -#ifdef Q_OS_SYMBIAN - QAction *quitAction = new QAction(tr("Exit"), this); - quitAction->setSoftKeyRole(QAction::NegativeSoftKey); - addAction(quitAction); -#else quitButton = new QPushButton(tr("Quit")); quitButton->setAutoDefault(false); -#endif if (!server.listen()) { QMessageBox::critical(this, tr("Threaded Fortune Server"), @@ -85,13 +79,6 @@ Dialog::Dialog(QWidget *parent) "Run the Fortune Client example now.") .arg(ipAddress).arg(server.serverPort())); -#ifdef Q_OS_SYMBIAN - connect(quitAction, SIGNAL(triggered()), this, SLOT(close())); - - QVBoxLayout *mainLayout = new QVBoxLayout; - mainLayout->addWidget(statusLabel); - setLayout(mainLayout); -#else connect(quitButton, SIGNAL(clicked()), this, SLOT(close())); QHBoxLayout *buttonLayout = new QHBoxLayout; @@ -103,6 +90,5 @@ Dialog::Dialog(QWidget *parent) mainLayout->addWidget(statusLabel); mainLayout->addLayout(buttonLayout); setLayout(mainLayout); -#endif setWindowTitle(tr("Threaded Fortune Server")); } diff --git a/examples/network/threadedfortuneserver/main.cpp b/examples/network/threadedfortuneserver/main.cpp index 1e245e9e01..0bf75aa18c 100644 --- a/examples/network/threadedfortuneserver/main.cpp +++ b/examples/network/threadedfortuneserver/main.cpp @@ -49,11 +49,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); Dialog dialog; -#ifdef Q_OS_SYMBIAN - dialog.showMaximized(); -#else dialog.show(); -#endif qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); return app.exec(); } diff --git a/examples/network/threadedfortuneserver/threadedfortuneserver.pro b/examples/network/threadedfortuneserver/threadedfortuneserver.pro index 1b4cd598a2..8520ed43e4 100644 --- a/examples/network/threadedfortuneserver/threadedfortuneserver.pro +++ b/examples/network/threadedfortuneserver/threadedfortuneserver.pro @@ -15,11 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS threadedfortuneserver.pr sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/threadedfortuneserver INSTALLS += target sources -symbian: { - CONFIG += qt_example - TARGET.CAPABILITY = NetworkServices -} -maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) -- cgit v1.2.3