summaryrefslogtreecommitdiffstats
path: root/examples/network
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-10-18 09:54:31 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-18 15:47:49 +0200
commit87274e272d2a854563066489e20d019b4e6320de (patch)
treed01e71403a41db3ca2b83599fcc7036d79d7a13e /examples/network
parent08e24858607d1b1483fb1faa54effa957501cfbb (diff)
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 <casper.vandonderen@nokia.com> Change-Id: I488a0adadb98934567aa6416206a80465c9c3a81 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'examples/network')
-rw-r--r--examples/network/bearermonitor/bearermonitor.cpp3
-rw-r--r--examples/network/bearermonitor/bearermonitor.h10
-rw-r--r--examples/network/bearermonitor/bearermonitor.pro8
-rw-r--r--examples/network/blockingfortuneclient/blockingclient.cpp40
-rw-r--r--examples/network/blockingfortuneclient/blockingclient.h5
-rw-r--r--examples/network/blockingfortuneclient/blockingfortuneclient.pro8
-rw-r--r--examples/network/blockingfortuneclient/main.cpp4
-rw-r--r--examples/network/broadcastreceiver/broadcastreceiver.pro5
-rw-r--r--examples/network/broadcastreceiver/main.cpp4
-rw-r--r--examples/network/broadcastreceiver/receiver.cpp14
-rw-r--r--examples/network/broadcastreceiver/receiver.h4
-rw-r--r--examples/network/broadcastsender/broadcastsender.pro6
-rw-r--r--examples/network/broadcastsender/main.cpp4
-rw-r--r--examples/network/download/download.pro3
-rw-r--r--examples/network/downloadmanager/downloadmanager.pro3
-rw-r--r--examples/network/fortuneclient/fortuneclient.pro11
-rw-r--r--examples/network/fortuneclient/main.cpp5
-rw-r--r--examples/network/fortuneserver/fortuneserver.pro12
-rw-r--r--examples/network/fortuneserver/main.cpp4
-rw-r--r--examples/network/googlesuggest/googlesuggest.pro4
-rw-r--r--examples/network/http/http.pro6
-rw-r--r--examples/network/http/httpwindow.cpp19
-rw-r--r--examples/network/http/httpwindow.h10
-rw-r--r--examples/network/http/main.cpp11
-rw-r--r--examples/network/loopback/dialog.cpp35
-rw-r--r--examples/network/loopback/dialog.h5
-rw-r--r--examples/network/loopback/loopback.pro6
-rw-r--r--examples/network/loopback/main.cpp4
-rw-r--r--examples/network/multicastreceiver/multicastreceiver.pro1
-rw-r--r--examples/network/multicastsender/multicastsender.pro1
-rw-r--r--examples/network/network-chat/main.cpp5
-rw-r--r--examples/network/network-chat/network-chat.pro9
-rw-r--r--examples/network/network-chat/peermanager.cpp4
-rw-r--r--examples/network/network.pro3
-rw-r--r--examples/network/qftp/ftpwindow.cpp15
-rw-r--r--examples/network/qftp/main.cpp14
-rw-r--r--examples/network/qftp/qftp.pro11
-rw-r--r--examples/network/securesocketclient/main.cpp4
-rw-r--r--examples/network/securesocketclient/securesocketclient.pro7
-rw-r--r--examples/network/securesocketclient/sslclient.cpp6
-rw-r--r--examples/network/threadedfortuneserver/dialog.cpp14
-rw-r--r--examples/network/threadedfortuneserver/main.cpp4
-rw-r--r--examples/network/threadedfortuneserver/threadedfortuneserver.pro7
-rw-r--r--examples/network/torrent/torrent.pro4
44 files changed, 1 insertions, 361 deletions
diff --git a/examples/network/bearermonitor/bearermonitor.cpp b/examples/network/bearermonitor/bearermonitor.cpp
index 43ae8e9027..a543c937c6 100644
--- a/examples/network/bearermonitor/bearermonitor.cpp
+++ b/examples/network/bearermonitor/bearermonitor.cpp
@@ -63,9 +63,6 @@ BearerMonitor::BearerMonitor(QWidget *parent)
delete tabWidget->currentWidget();
sessionGroup->hide();
#endif
-#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE) || defined(MAEMO_UI) || defined(Q_WS_SIMULATOR)
- setWindowState(Qt::WindowMaximized);
-#endif
updateConfigurations();
onlineStateChanged(!manager.allConfigurations(QNetworkConfiguration::Active).isEmpty());
QNetworkConfiguration defaultConfiguration = manager.defaultConfiguration();
diff --git a/examples/network/bearermonitor/bearermonitor.h b/examples/network/bearermonitor/bearermonitor.h
index f4dbf81dee..c4199d6230 100644
--- a/examples/network/bearermonitor/bearermonitor.h
+++ b/examples/network/bearermonitor/bearermonitor.h
@@ -43,13 +43,7 @@
#include <qnetworkconfigmanager.h>
#include <qnetworksession.h>
-#if defined (Q_OS_SYMBIAN) || defined(Q_OS_WINCE) || defined(Q_WS_SIMULATOR)
-#include "ui_bearermonitor_240_320.h"
-#elif defined(MAEMO_UI)
-#include "ui_bearermonitor_maemo.h"
-#else
#include "ui_bearermonitor_640_480.h"
-#endif
QT_USE_NAMESPACE
@@ -72,7 +66,7 @@ private slots:
void onlineStateChanged(bool isOnline);
-#if defined(Q_OS_WIN) || defined(Q_WS_SIMULATOR)
+#if defined(Q_OS_WIN)
void registerNetwork();
void unregisterNetwork();
#endif
@@ -81,9 +75,7 @@ private slots:
void createSessionFor(QTreeWidgetItem *item);
void createNewSession();
-#ifndef MAEMO_UI
void deleteSession();
-#endif
void performScan();
private:
diff --git a/examples/network/bearermonitor/bearermonitor.pro b/examples/network/bearermonitor/bearermonitor.pro
index 8b2b33affb..3486bc1b5c 100644
--- a/examples/network/bearermonitor/bearermonitor.pro
+++ b/examples/network/bearermonitor/bearermonitor.pro
@@ -23,11 +23,3 @@ wince*:LIBS += -lws2
CONFIG += console
-symbian: {
- TARGET.CAPABILITY = NetworkServices ReadUserData
- CONFIG += qt_example
-}
-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)
diff --git a/examples/network/blockingfortuneclient/blockingclient.cpp b/examples/network/blockingfortuneclient/blockingclient.cpp
index 0491433d56..8867e25678 100644
--- a/examples/network/blockingfortuneclient/blockingclient.cpp
+++ b/examples/network/blockingfortuneclient/blockingclient.cpp
@@ -68,10 +68,6 @@ BlockingClient::BlockingClient(QWidget *parent)
portLineEdit = new QLineEdit;
portLineEdit->setValidator(new QIntValidator(1, 65535, this));
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- Qt::InputMethodHint hints = Qt::ImhDigitsOnly;
- portLineEdit->setInputMethodHints(hints);
-#endif
hostLabel->setBuddy(hostLineEdit);
portLabel->setBuddy(portLineEdit);
@@ -80,23 +76,6 @@ BlockingClient::BlockingClient(QWidget *parent)
"Fortune Server example as well."));
statusLabel->setWordWrap(true);
-#ifdef Q_OS_SYMBIAN
- QMenu *menu = new QMenu(this);
- fortuneAction = menu->addAction(tr("Get Fortune"));
- fortuneAction->setVisible(false);
-
- QAction *optionsAction = new QAction(tr("Options"), this);
- optionsAction->setMenu(menu);
- optionsAction->setSoftKeyRole(QAction::PositiveSoftKey);
- addAction(optionsAction);
-
- exitAction = new QAction(tr("Exit"), this);
- exitAction->setSoftKeyRole(QAction::NegativeSoftKey);
- addAction(exitAction);
-
- connect(fortuneAction, SIGNAL(triggered()), this, SLOT(requestNewFortune()));
- connect(exitAction, SIGNAL(triggered()), this, SLOT(close()));
-#else
getFortuneButton = new QPushButton(tr("Get Fortune"));
getFortuneButton->setDefault(true);
getFortuneButton->setEnabled(false);
@@ -109,7 +88,6 @@ BlockingClient::BlockingClient(QWidget *parent)
connect(getFortuneButton, SIGNAL(clicked()), this, SLOT(requestNewFortune()));
connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
-#endif
connect(hostLineEdit, SIGNAL(textChanged(QString)),
this, SLOT(enableGetFortuneButton()));
@@ -129,9 +107,7 @@ BlockingClient::BlockingClient(QWidget *parent)
mainLayout->addWidget(portLabel, 1, 0);
mainLayout->addWidget(portLineEdit, 1, 1);
mainLayout->addWidget(statusLabel, 2, 0, 1, 2);
-#ifndef Q_OS_SYMBIAN
mainLayout->addWidget(buttonBox, 3, 0, 1, 2);
-#endif
setLayout(mainLayout);
setWindowTitle(tr("Blocking Fortune Client"));
@@ -141,11 +117,7 @@ BlockingClient::BlockingClient(QWidget *parent)
//! [2]
void BlockingClient::requestNewFortune()
{
-#ifdef Q_OS_SYMBIAN
- fortuneAction->setVisible(false);
-#else
getFortuneButton->setEnabled(false);
-#endif
thread.requestNewFortune(hostLineEdit->text(),
portLineEdit->text().toInt());
}
@@ -163,11 +135,7 @@ void BlockingClient::showFortune(const QString &nextFortune)
//! [4]
currentFortune = nextFortune;
statusLabel->setText(currentFortune);
-#ifdef Q_OS_SYMBIAN
- fortuneAction->setVisible(true);
-#else
getFortuneButton->setEnabled(true);
-#endif
}
//! [4]
@@ -192,19 +160,11 @@ void BlockingClient::displayError(int socketError, const QString &message)
.arg(message));
}
-#ifdef Q_OS_SYMBIAN
- fortuneAction->setVisible(true);
-#else
getFortuneButton->setEnabled(true);
-#endif
}
void BlockingClient::enableGetFortuneButton()
{
bool enable(!hostLineEdit->text().isEmpty() && !portLineEdit->text().isEmpty());
-#ifdef Q_OS_SYMBIAN
- fortuneAction->setVisible(enable);
-#else
getFortuneButton->setEnabled(enable);
-#endif
}
diff --git a/examples/network/blockingfortuneclient/blockingclient.h b/examples/network/blockingfortuneclient/blockingclient.h
index 83ff93b228..99b97f13c5 100644
--- a/examples/network/blockingfortuneclient/blockingclient.h
+++ b/examples/network/blockingfortuneclient/blockingclient.h
@@ -73,14 +73,9 @@ private:
QLineEdit *hostLineEdit;
QLineEdit *portLineEdit;
QLabel *statusLabel;
-#ifdef Q_OS_SYMBIAN
- QAction *fortuneAction;
- QAction *exitAction;
-#else
QPushButton *getFortuneButton;
QPushButton *quitButton;
QDialogButtonBox *buttonBox;
-#endif
FortuneThread thread;
QString currentFortune;
diff --git a/examples/network/blockingfortuneclient/blockingfortuneclient.pro b/examples/network/blockingfortuneclient/blockingfortuneclient.pro
index 3fe6f7c7ab..c8689b39fb 100644
--- a/examples/network/blockingfortuneclient/blockingfortuneclient.pro
+++ b/examples/network/blockingfortuneclient/blockingfortuneclient.pro
@@ -13,11 +13,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS blockingfortuneclient.pr
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/blockingfortuneclient
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)
diff --git a/examples/network/blockingfortuneclient/main.cpp b/examples/network/blockingfortuneclient/main.cpp
index 97ce59fdb3..b67464089b 100644
--- a/examples/network/blockingfortuneclient/main.cpp
+++ b/examples/network/blockingfortuneclient/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
BlockingClient client;
-#ifdef Q_OS_SYMBIAN
- client.showMaximized();
-#else
client.show();
-#endif
return app.exec();
}
diff --git a/examples/network/broadcastreceiver/broadcastreceiver.pro b/examples/network/broadcastreceiver/broadcastreceiver.pro
index bc6b0ee55a..712da4931f 100644
--- a/examples/network/broadcastreceiver/broadcastreceiver.pro
+++ b/examples/network/broadcastreceiver/broadcastreceiver.pro
@@ -11,8 +11,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS broadcastreceiver.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/broadcastreceiver
INSTALLS += target sources
-symbian: {
- CONFIG += qt_example
- TARGET.CAPABILITY = NetworkServices
-}
-maemo5: CONFIG += qt_example
diff --git a/examples/network/broadcastreceiver/main.cpp b/examples/network/broadcastreceiver/main.cpp
index 80d0bba869..748f4b5de1 100644
--- a/examples/network/broadcastreceiver/main.cpp
+++ b/examples/network/broadcastreceiver/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Receiver receiver;
-#ifdef Q_OS_SYMBIAN
- receiver.showMaximized();
-#else
receiver.show();
-#endif
return app.exec();
}
diff --git a/examples/network/broadcastreceiver/receiver.cpp b/examples/network/broadcastreceiver/receiver.cpp
index e0830283a9..6a49046c91 100644
--- a/examples/network/broadcastreceiver/receiver.cpp
+++ b/examples/network/broadcastreceiver/receiver.cpp
@@ -49,13 +49,7 @@ Receiver::Receiver(QWidget *parent)
statusLabel = new QLabel(tr("Listening for broadcasted messages"));
statusLabel->setWordWrap(true);
-#ifdef Q_OS_SYMBIAN
- quitAction = new QAction(tr("Exit"), this);
- quitAction->setSoftKeyRole(QAction::NegativeSoftKey);
- addAction(quitAction);
-#else
quitButton = new QPushButton(tr("&Quit"));
-#endif
//! [0]
udpSocket = new QUdpSocket(this);
@@ -66,13 +60,6 @@ Receiver::Receiver(QWidget *parent)
connect(udpSocket, SIGNAL(readyRead()),
this, SLOT(processPendingDatagrams()));
//! [1]
-#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;
@@ -84,7 +71,6 @@ Receiver::Receiver(QWidget *parent)
mainLayout->addWidget(statusLabel);
mainLayout->addLayout(buttonLayout);
setLayout(mainLayout);
-#endif
setWindowTitle(tr("Broadcast Receiver"));
}
diff --git a/examples/network/broadcastreceiver/receiver.h b/examples/network/broadcastreceiver/receiver.h
index 3084da1e26..7a282d2253 100644
--- a/examples/network/broadcastreceiver/receiver.h
+++ b/examples/network/broadcastreceiver/receiver.h
@@ -62,11 +62,7 @@ private slots:
private:
QLabel *statusLabel;
-#ifdef Q_OS_SYMBIAN
- QAction *quitAction;
-#else
QPushButton *quitButton;
-#endif
QUdpSocket *udpSocket;
};
diff --git a/examples/network/broadcastsender/broadcastsender.pro b/examples/network/broadcastsender/broadcastsender.pro
index 0944164e7c..40f173f3e7 100644
--- a/examples/network/broadcastsender/broadcastsender.pro
+++ b/examples/network/broadcastsender/broadcastsender.pro
@@ -10,9 +10,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/broadcastsender
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS broadcastsender.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/broadcastsender
INSTALLS += target sources
-
-symbian: {
- CONFIG += qt_example
- TARGET.CAPABILITY = NetworkServices
-}
-maemo5: CONFIG += qt_example
diff --git a/examples/network/broadcastsender/main.cpp b/examples/network/broadcastsender/main.cpp
index 88be21d2d8..7c70255aec 100644
--- a/examples/network/broadcastsender/main.cpp
+++ b/examples/network/broadcastsender/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Sender sender;
-#ifdef Q_OS_SYMBIAN
- sender.showMaximized();
-#else
sender.show();
-#endif
return app.exec();
}
diff --git a/examples/network/download/download.pro b/examples/network/download/download.pro
index a3b270d252..7c53044f69 100644
--- a/examples/network/download/download.pro
+++ b/examples/network/download/download.pro
@@ -17,8 +17,5 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/download
INSTALLS += target sources
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
-symbian: warning(This example might not fully work on Symbian platform)
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/network/downloadmanager/downloadmanager.pro b/examples/network/downloadmanager/downloadmanager.pro
index 2f83f41afc..6b7e4f8757 100644
--- a/examples/network/downloadmanager/downloadmanager.pro
+++ b/examples/network/downloadmanager/downloadmanager.pro
@@ -18,8 +18,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/downloadmanager
INSTALLS += target sources
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
OTHER_FILES += \
debian/changelog \
@@ -28,5 +26,4 @@ OTHER_FILES += \
debian/copyright \
debian/README \
debian/rules
-symbian: warning(This example might not fully work on Symbian platform)
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/network/fortuneclient/fortuneclient.pro b/examples/network/fortuneclient/fortuneclient.pro
index b5cb3b4390..b8d311b891 100644
--- a/examples/network/fortuneclient/fortuneclient.pro
+++ b/examples/network/fortuneclient/fortuneclient.pro
@@ -10,14 +10,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/fortuneclient
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fortuneclient.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/fortuneclient
INSTALLS += target sources
-
-symbian {
- CONFIG += qt_example
- TARGET.CAPABILITY = "NetworkServices ReadUserData WriteUserData"
- TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
-}
-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)
-simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/network/fortuneclient/main.cpp b/examples/network/fortuneclient/main.cpp
index bf3cec187f..f6c459ee90 100644
--- a/examples/network/fortuneclient/main.cpp
+++ b/examples/network/fortuneclient/main.cpp
@@ -45,11 +45,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Client client;
-#ifdef Q_OS_SYMBIAN
- // Make application better looking and more usable on small screen
- client.showMaximized();
-#else
client.show();
-#endif
return client.exec();
}
diff --git a/examples/network/fortuneserver/fortuneserver.pro b/examples/network/fortuneserver/fortuneserver.pro
index ed865e4ca5..ac7e82f63b 100644
--- a/examples/network/fortuneserver/fortuneserver.pro
+++ b/examples/network/fortuneserver/fortuneserver.pro
@@ -10,15 +10,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/fortuneserver
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fortuneserver.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/fortuneserver
INSTALLS += target sources
-
-symbian {
- TARGET.UID3 = 0xA000E406
- CONFIG += qt_example
- TARGET.CAPABILITY = "NetworkServices ReadUserData"
- TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
-}
-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)
-simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/network/fortuneserver/main.cpp b/examples/network/fortuneserver/main.cpp
index 74f182e8d8..6c0e9ee9f3 100644
--- a/examples/network/fortuneserver/main.cpp
+++ b/examples/network/fortuneserver/main.cpp
@@ -49,11 +49,7 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Server server;
-#ifdef Q_OS_SYMBIAN
- server.showMaximized();
-#else
server.show();
-#endif
qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
return server.exec();
}
diff --git a/examples/network/googlesuggest/googlesuggest.pro b/examples/network/googlesuggest/googlesuggest.pro
index 97866f6f32..b5ff5f16f1 100644
--- a/examples/network/googlesuggest/googlesuggest.pro
+++ b/examples/network/googlesuggest/googlesuggest.pro
@@ -8,9 +8,5 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/googlesuggest
INSTALLS += target sources
-symbian: CONFIG += qt_example
-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)
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/network/http/http.pro b/examples/network/http/http.pro
index 6f4b7be076..8349de4622 100644
--- a/examples/network/http/http.pro
+++ b/examples/network/http/http.pro
@@ -11,9 +11,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/http
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS http.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/http
INSTALLS += target sources
-
-symbian: {
- CONFIG += qt_example
- TARGET.CAPABILITY = NetworkServices
-}
-maemo5: CONFIG += qt_example
diff --git a/examples/network/http/httpwindow.cpp b/examples/network/http/httpwindow.cpp
index 77c1e314c7..082dc910ca 100644
--- a/examples/network/http/httpwindow.cpp
+++ b/examples/network/http/httpwindow.cpp
@@ -45,11 +45,7 @@
#include "ui_authenticationdialog.h"
HttpWindow::HttpWindow(QWidget *parent)
-#ifdef Q_WS_MAEMO_5
- : QWidget(parent)
-#else
: QDialog(parent)
-#endif
{
#ifndef QT_NO_OPENSSL
urlLineEdit = new QLineEdit("https://qt.nokia.com/");
@@ -72,9 +68,7 @@ HttpWindow::HttpWindow(QWidget *parent)
buttonBox->addButton(downloadButton, QDialogButtonBox::ActionRole);
buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole);
-#ifndef Q_WS_MAEMO_5
progressDialog = new QProgressDialog(this);
-#endif
connect(urlLineEdit, SIGNAL(textChanged(QString)),
this, SLOT(enableDownloadButton()));
@@ -85,9 +79,7 @@ HttpWindow::HttpWindow(QWidget *parent)
connect(&qnam, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
this, SLOT(sslErrors(QNetworkReply*,QList<QSslError>)));
#endif
-#ifndef Q_WS_MAEMO_5
connect(progressDialog, SIGNAL(canceled()), this, SLOT(cancelDownload()));
-#endif
connect(downloadButton, SIGNAL(clicked()), this, SLOT(downloadFile()));
connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
@@ -145,10 +137,8 @@ void HttpWindow::downloadFile()
return;
}
-#ifndef Q_WS_MAEMO_5
progressDialog->setWindowTitle(tr("HTTP"));
progressDialog->setLabelText(tr("Downloading %1.").arg(fileName));
-#endif
downloadButton->setEnabled(false);
// schedule the request
@@ -174,15 +164,11 @@ void HttpWindow::httpFinished()
file = 0;
}
reply->deleteLater();
-#ifndef Q_WS_MAEMO_5
progressDialog->hide();
-#endif
return;
}
-#ifndef Q_WS_MAEMO_5
progressDialog->hide();
-#endif
file->flush();
file->close();
@@ -233,13 +219,8 @@ void HttpWindow::updateDataReadProgress(qint64 bytesRead, qint64 totalBytes)
if (httpRequestAborted)
return;
-#ifndef Q_WS_MAEMO_5
progressDialog->setMaximum(totalBytes);
progressDialog->setValue(bytesRead);
-#else
- Q_UNUSED(bytesRead);
- Q_UNUSED(totalBytes);
-#endif
}
void HttpWindow::enableDownloadButton()
diff --git a/examples/network/http/httpwindow.h b/examples/network/http/httpwindow.h
index 8bbe1a261a..0ec87af48a 100644
--- a/examples/network/http/httpwindow.h
+++ b/examples/network/http/httpwindow.h
@@ -41,11 +41,7 @@
#ifndef HTTPWINDOW_H
#define HTTPWINDOW_H
-#ifdef Q_WS_MAEMO_5
-#include <QWidget>
-#else
#include <QDialog>
-#endif
#include <QNetworkAccessManager>
#include <QUrl>
@@ -63,11 +59,7 @@ class QNetworkReply;
QT_END_NAMESPACE
-#ifdef Q_WS_MAEMO_5
-class HttpWindow : public QWidget
-#else
class HttpWindow : public QDialog
-#endif
{
Q_OBJECT
@@ -92,9 +84,7 @@ private:
QLabel *statusLabel;
QLabel *urlLabel;
QLineEdit *urlLineEdit;
-#ifndef Q_WS_MAEMO_5
QProgressDialog *progressDialog;
-#endif
QPushButton *downloadButton;
QPushButton *quitButton;
QDialogButtonBox *buttonBox;
diff --git a/examples/network/http/main.cpp b/examples/network/http/main.cpp
index e4f157476c..ae20f6f41c 100644
--- a/examples/network/http/main.cpp
+++ b/examples/network/http/main.cpp
@@ -47,20 +47,9 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
-#if defined(Q_OS_SYMBIAN)
- // Change current directory from default private to c:\data
- // in order that user can access the downloaded content
- QDir::setCurrent("c:\\data");
-#elif defined(Q_WS_MAEMO_5)
- QDir::setCurrent("/home/user");
-#endif
HttpWindow httpWin;
-#if defined(Q_OS_SYMBIAN)
- httpWin.showMaximized();
-#else
httpWin.show();
-#endif
return app.exec();
}
diff --git a/examples/network/loopback/dialog.cpp b/examples/network/loopback/dialog.cpp
index f9a51268b7..34fc999dcc 100644
--- a/examples/network/loopback/dialog.cpp
+++ b/examples/network/loopback/dialog.cpp
@@ -43,11 +43,7 @@
#include "dialog.h"
-#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
static const int TotalBytes = 50 * 1024 * 1024;
-#else
-static const int TotalBytes = 5 * 1024 * 1024;
-#endif
static const int PayloadSize = 64 * 1024; // 64 KB
Dialog::Dialog(QWidget *parent)
@@ -58,22 +54,6 @@ Dialog::Dialog(QWidget *parent)
serverProgressBar = new QProgressBar;
serverStatusLabel = new QLabel(tr("Server ready"));
-#ifdef Q_OS_SYMBIAN
- QMenu *menu = new QMenu(this);
-
- QAction *optionsAction = new QAction(tr("Options"), this);
- optionsAction->setSoftKeyRole(QAction::PositiveSoftKey);
- optionsAction->setMenu(menu);
- addAction(optionsAction);
-
- startAction = menu->addAction(tr("Start"), this, SLOT(start()));
-
- quitAction = new QAction(tr("Exit"), this);
- quitAction->setSoftKeyRole(QAction::NegativeSoftKey);
- addAction(quitAction);
-
- connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
-#else
startButton = new QPushButton(tr("&Start"));
quitButton = new QPushButton(tr("&Quit"));
@@ -83,7 +63,6 @@ Dialog::Dialog(QWidget *parent)
connect(startButton, SIGNAL(clicked()), this, SLOT(start()));
connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
-#endif
connect(&tcpServer, SIGNAL(newConnection()),
this, SLOT(acceptConnection()));
connect(&tcpClient, SIGNAL(connected()), this, SLOT(startTransfer()));
@@ -99,9 +78,7 @@ Dialog::Dialog(QWidget *parent)
mainLayout->addWidget(serverStatusLabel);
mainLayout->addStretch(1);
mainLayout->addSpacing(10);
-#ifndef Q_OS_SYMBIAN
mainLayout->addWidget(buttonBox);
-#endif
setLayout(mainLayout);
setWindowTitle(tr("Loopback"));
@@ -109,11 +86,7 @@ Dialog::Dialog(QWidget *parent)
void Dialog::start()
{
-#ifdef Q_OS_SYMBIAN
- startAction->setVisible(false);
-#else
startButton->setEnabled(false);
-#endif
#ifndef QT_NO_CURSOR
QApplication::setOverrideCursor(Qt::WaitCursor);
@@ -169,11 +142,7 @@ void Dialog::updateServerProgress()
if (bytesReceived == TotalBytes) {
tcpServerConnection->close();
-#ifdef Q_OS_SYMBIAN
- startAction->setVisible(true);
-#else
startButton->setEnabled(true);
-#endif
#ifndef QT_NO_CURSOR
QApplication::restoreOverrideCursor();
#endif
@@ -210,11 +179,7 @@ void Dialog::displayError(QAbstractSocket::SocketError socketError)
serverProgressBar->reset();
clientStatusLabel->setText(tr("Client ready"));
serverStatusLabel->setText(tr("Server ready"));
-#ifdef Q_OS_SYMBIAN
- startAction->setVisible(true);
-#else
startButton->setEnabled(true);
-#endif
#ifndef QT_NO_CURSOR
QApplication::restoreOverrideCursor();
#endif
diff --git a/examples/network/loopback/dialog.h b/examples/network/loopback/dialog.h
index b48c090d3f..8261b2279a 100644
--- a/examples/network/loopback/dialog.h
+++ b/examples/network/loopback/dialog.h
@@ -76,14 +76,9 @@ private:
QLabel *clientStatusLabel;
QLabel *serverStatusLabel;
-#ifdef Q_OS_SYMBIAN
- QAction *startAction;
- QAction *quitAction;
-#else
QPushButton *startButton;
QPushButton *quitButton;
QDialogButtonBox *buttonBox;
-#endif
QTcpServer tcpServer;
QTcpSocket tcpClient;
diff --git a/examples/network/loopback/loopback.pro b/examples/network/loopback/loopback.pro
index c96868fb40..760a366d54 100644
--- a/examples/network/loopback/loopback.pro
+++ b/examples/network/loopback/loopback.pro
@@ -10,9 +10,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/loopback
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS loopback.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/loopback
INSTALLS += target sources
-
-symbian: {
- CONFIG += qt_example
- TARGET.CAPABILITY = NetworkServices
-}
-maemo5: CONFIG += qt_example
diff --git a/examples/network/loopback/main.cpp b/examples/network/loopback/main.cpp
index 7f26fd4357..03ac9ad84c 100644
--- a/examples/network/loopback/main.cpp
+++ b/examples/network/loopback/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Dialog dialog;
-#ifdef Q_OS_SYMBIAN
- dialog.showMaximized();
-#else
dialog.show();
-#endif
return app.exec();
}
diff --git a/examples/network/multicastreceiver/multicastreceiver.pro b/examples/network/multicastreceiver/multicastreceiver.pro
index caeca7ff46..9f0ba09dc7 100644
--- a/examples/network/multicastreceiver/multicastreceiver.pro
+++ b/examples/network/multicastreceiver/multicastreceiver.pro
@@ -11,4 +11,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS multicastreceiver.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/multicastreceiver
INSTALLS += target sources
-symbian: CONFIG += qt_example
diff --git a/examples/network/multicastsender/multicastsender.pro b/examples/network/multicastsender/multicastsender.pro
index a0cdc61eab..bc49b3eca3 100644
--- a/examples/network/multicastsender/multicastsender.pro
+++ b/examples/network/multicastsender/multicastsender.pro
@@ -9,4 +9,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS multicastsender.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/multicastsender
INSTALLS += target sources
-symbian: CONFIG += qt_example
diff --git a/examples/network/network-chat/main.cpp b/examples/network/network-chat/main.cpp
index a126172b74..94a4dacae8 100644
--- a/examples/network/network-chat/main.cpp
+++ b/examples/network/network-chat/main.cpp
@@ -88,11 +88,6 @@ int main(int argc, char *argv[])
}
ChatDialog dialog;
-#ifdef Q_OS_SYMBIAN
- // Make application better looking and more usable on small screen
- dialog.showMaximized();
-#else
dialog.show();
-#endif
return app.exec();
}
diff --git a/examples/network/network-chat/network-chat.pro b/examples/network/network-chat/network-chat.pro
index f6650f1d40..49b32aa356 100644
--- a/examples/network/network-chat/network-chat.pro
+++ b/examples/network/network-chat/network-chat.pro
@@ -18,13 +18,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS network-chat.pro *.chat
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/network-chat
INSTALLS += target sources
-symbian {
- CONFIG += qt_example
- LIBS += -lcharconv
- TARGET.CAPABILITY = "NetworkServices ReadUserData WriteUserData"
- TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
-}
-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)
diff --git a/examples/network/network-chat/peermanager.cpp b/examples/network/network-chat/peermanager.cpp
index 0e5bd1724e..a0374e7e7e 100644
--- a/examples/network/network-chat/peermanager.cpp
+++ b/examples/network/network-chat/peermanager.cpp
@@ -69,11 +69,7 @@ PeerManager::PeerManager(Client *client)
}
if (username.isEmpty())
-#ifndef Q_OS_SYMBIAN
username = "unknown";
-#else
- username = "QtS60";
-#endif
updateAddresses();
serverPort = 0;
diff --git a/examples/network/network.pro b/examples/network/network.pro
index 90079f9b50..f12a6a1d47 100644
--- a/examples/network/network.pro
+++ b/examples/network/network.pro
@@ -27,13 +27,10 @@ SUBDIRS = \
contains(QT_CONFIG, openssl-linked):SUBDIRS += securesocketclient
}
-symbian: SUBDIRS = qftp
# install
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS network.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network
INSTALLS += sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/network/qftp/ftpwindow.cpp b/examples/network/qftp/ftpwindow.cpp
index 1c0d057c66..b0d2e5d9d8 100644
--- a/examples/network/qftp/ftpwindow.cpp
+++ b/examples/network/qftp/ftpwindow.cpp
@@ -51,10 +51,6 @@ FtpWindow::FtpWindow(QWidget *parent)
ftpServerLabel->setBuddy(ftpServerLineEdit);
statusLabel = new QLabel(tr("Please enter the name of an FTP server."));
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- // Use word wrapping to fit the text on screen
- statusLabel->setWordWrap( true );
-#endif
fileList = new QTreeWidget;
fileList->setEnabled(false);
@@ -93,22 +89,11 @@ FtpWindow::FtpWindow(QWidget *parent)
QHBoxLayout *topLayout = new QHBoxLayout;
topLayout->addWidget(ftpServerLabel);
topLayout->addWidget(ftpServerLineEdit);
-#ifndef Q_OS_SYMBIAN
topLayout->addWidget(cdToParentButton);
topLayout->addWidget(connectButton);
-#else
- // Make app better lookin on small screen
- QHBoxLayout *topLayout2 = new QHBoxLayout;
- topLayout2->addWidget(cdToParentButton);
- topLayout2->addWidget(connectButton);
-#endif
QVBoxLayout *mainLayout = new QVBoxLayout;
mainLayout->addLayout(topLayout);
-#ifdef Q_OS_SYMBIAN
- // Make app better lookin on small screen
- mainLayout->addLayout(topLayout2);
-#endif
mainLayout->addWidget(fileList);
mainLayout->addWidget(statusLabel);
mainLayout->addWidget(buttonBox);
diff --git a/examples/network/qftp/main.cpp b/examples/network/qftp/main.cpp
index f6eb2d4db2..15689b5a55 100644
--- a/examples/network/qftp/main.cpp
+++ b/examples/network/qftp/main.cpp
@@ -41,26 +41,12 @@
#include <QApplication>
#include "ftpwindow.h"
-#ifdef Q_OS_SYMBIAN
-#include <QDir>
-#include <QDesktopWidget>
-#endif
int main(int argc, char *argv[])
{
Q_INIT_RESOURCE(ftp);
-#ifdef Q_OS_SYMBIAN
- // Change current directory from default private to c:\data
- // in order that user can access the downloaded content
- QDir::setCurrent( "c:\\data" );
-#endif
QApplication app(argc, argv);
FtpWindow ftpWin;
-#ifdef Q_OS_SYMBIAN
- // Make application better looking and more usable on small screen
- ftpWin.showMaximized();
-#else
ftpWin.show();
-#endif
return ftpWin.exec();
}
diff --git a/examples/network/qftp/qftp.pro b/examples/network/qftp/qftp.pro
index f0efe630b9..c554b37a03 100644
--- a/examples/network/qftp/qftp.pro
+++ b/examples/network/qftp/qftp.pro
@@ -11,14 +11,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/qftp
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/qftp
INSTALLS += target sources
-
-symbian {
- TARGET.UID3 = 0xA000A648
- CONFIG += qt_example
- INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
- TARGET.CAPABILITY="NetworkServices ReadUserData WriteUserData"
-}
-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)
diff --git a/examples/network/securesocketclient/main.cpp b/examples/network/securesocketclient/main.cpp
index ca50f31dcf..c15534b523 100644
--- a/examples/network/securesocketclient/main.cpp
+++ b/examples/network/securesocketclient/main.cpp
@@ -56,11 +56,7 @@ int main(int argc, char **argv)
}
SslClient client;
-#ifdef Q_OS_SYMBIAN
- client.showMaximized();
-#else
client.show();
-#endif
return app.exec();
}
diff --git a/examples/network/securesocketclient/securesocketclient.pro b/examples/network/securesocketclient/securesocketclient.pro
index 94c01cd757..39da4750af 100644
--- a/examples/network/securesocketclient/securesocketclient.pro
+++ b/examples/network/securesocketclient/securesocketclient.pro
@@ -15,10 +15,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png *.jpg images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/securesocketclient
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000CF67
- CONFIG += qt_example
- TARGET.CAPABILITY = NetworkServices
-}
-maemo5: CONFIG += qt_example
-
diff --git a/examples/network/securesocketclient/sslclient.cpp b/examples/network/securesocketclient/sslclient.cpp
index 9d6af86813..8d862c4c56 100644
--- a/examples/network/securesocketclient/sslclient.cpp
+++ b/examples/network/securesocketclient/sslclient.cpp
@@ -192,9 +192,6 @@ void SslClient::sslErrors(const QList<QSslError> &errors)
ui.sslErrorList->addItem(error.errorString());
executingDialog = true;
-#ifdef Q_OS_SYMBIAN
- errorDialog.showMaximized();
-#endif
if (errorDialog.exec() == QDialog::Accepted)
socket->ignoreSslErrors();
executingDialog = false;
@@ -208,9 +205,6 @@ void SslClient::displayCertificateInfo()
{
CertificateInfo *info = new CertificateInfo(this);
info->setCertificateChain(socket->peerCertificateChain());
-#ifdef Q_OS_SYMBIAN
- info->showMaximized();
-#endif
info->exec();
info->deleteLater();
}
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)
diff --git a/examples/network/torrent/torrent.pro b/examples/network/torrent/torrent.pro
index b2da8b6b56..36bc795faf 100644
--- a/examples/network/torrent/torrent.pro
+++ b/examples/network/torrent/torrent.pro
@@ -38,9 +38,5 @@ sources.files += icons forms 3rdparty
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/torrent
INSTALLS += target sources
-symbian: CONFIG += qt_example
-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)
simulator: warning(This example might not fully work on Simulator platform)