diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-18 09:54:31 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-18 15:47:49 +0200 |
commit | 87274e272d2a854563066489e20d019b4e6320de (patch) | |
tree | d01e71403a41db3ca2b83599fcc7036d79d7a13e /examples/network/broadcastreceiver | |
parent | 08e24858607d1b1483fb1faa54effa957501cfbb (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/broadcastreceiver')
-rw-r--r-- | examples/network/broadcastreceiver/broadcastreceiver.pro | 5 | ||||
-rw-r--r-- | examples/network/broadcastreceiver/main.cpp | 4 | ||||
-rw-r--r-- | examples/network/broadcastreceiver/receiver.cpp | 14 | ||||
-rw-r--r-- | examples/network/broadcastreceiver/receiver.h | 4 |
4 files changed, 0 insertions, 27 deletions
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; }; |