summaryrefslogtreecommitdiffstats
path: root/examples/ipc
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/ipc
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/ipc')
-rw-r--r--examples/ipc/ipc.pro2
-rw-r--r--examples/ipc/localfortuneclient/client.cpp4
-rw-r--r--examples/ipc/localfortuneclient/client.h8
-rw-r--r--examples/ipc/localfortuneclient/localfortuneclient.pro4
-rw-r--r--examples/ipc/localfortuneclient/main.cpp4
-rw-r--r--examples/ipc/localfortuneserver/localfortuneserver.pro2
-rw-r--r--examples/ipc/localfortuneserver/main.cpp4
-rw-r--r--examples/ipc/localfortuneserver/server.cpp4
-rw-r--r--examples/ipc/localfortuneserver/server.h8
-rw-r--r--examples/ipc/sharedmemory/sharedmemory.pro4
10 files changed, 0 insertions, 44 deletions
diff --git a/examples/ipc/ipc.pro b/examples/ipc/ipc.pro
index 3c07ce9af8..d7b4fbb28e 100644
--- a/examples/ipc/ipc.pro
+++ b/examples/ipc/ipc.pro
@@ -8,6 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS ipc.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc
INSTALLS += sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/ipc/localfortuneclient/client.cpp b/examples/ipc/localfortuneclient/client.cpp
index 2884fac7a7..e637cce3c9 100644
--- a/examples/ipc/localfortuneclient/client.cpp
+++ b/examples/ipc/localfortuneclient/client.cpp
@@ -44,11 +44,7 @@
#include "client.h"
Client::Client(QWidget *parent)
-#ifdef Q_WS_MAEMO_5
- : QWidget(parent)
-#else
: QDialog(parent)
-#endif
{
hostLabel = new QLabel(tr("&Server name:"));
hostLineEdit = new QLineEdit("fortune");
diff --git a/examples/ipc/localfortuneclient/client.h b/examples/ipc/localfortuneclient/client.h
index b0f0e36189..30dc482a4a 100644
--- a/examples/ipc/localfortuneclient/client.h
+++ b/examples/ipc/localfortuneclient/client.h
@@ -41,11 +41,7 @@
#ifndef CLIENT_H
#define CLIENT_H
-#ifdef Q_WS_MAEMO_5
-#include <QWidget>
-#else
#include <QDialog>
-#endif
#include <qlocalsocket.h>
@@ -57,11 +53,7 @@ class QPushButton;
class QLocalSocket;
QT_END_NAMESPACE
-#ifdef Q_WS_MAEMO_5
-class Client : public QWidget
-#else
class Client : public QDialog
-#endif
{
Q_OBJECT
diff --git a/examples/ipc/localfortuneclient/localfortuneclient.pro b/examples/ipc/localfortuneclient/localfortuneclient.pro
index bace9574cf..ee46a06bfb 100644
--- a/examples/ipc/localfortuneclient/localfortuneclient.pro
+++ b/examples/ipc/localfortuneclient/localfortuneclient.pro
@@ -9,9 +9,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS localfortuneclient.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc/localfortuneclient
INSTALLS += target sources
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/ipc/localfortuneclient/main.cpp b/examples/ipc/localfortuneclient/main.cpp
index 8e6feeba72..557ca3add0 100644
--- a/examples/ipc/localfortuneclient/main.cpp
+++ b/examples/ipc/localfortuneclient/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Client client;
-#if defined(Q_WS_S60)
- client.showMaximized();
-#else
client.show();
-#endif
return app.exec();
}
diff --git a/examples/ipc/localfortuneserver/localfortuneserver.pro b/examples/ipc/localfortuneserver/localfortuneserver.pro
index 4c55f3b11d..4deda4571c 100644
--- a/examples/ipc/localfortuneserver/localfortuneserver.pro
+++ b/examples/ipc/localfortuneserver/localfortuneserver.pro
@@ -9,7 +9,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS localfortuneserver.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc/localfortuneserver
INSTALLS += target sources
-symbian: CONFIG += qt_example
-maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/ipc/localfortuneserver/main.cpp b/examples/ipc/localfortuneserver/main.cpp
index fc0c698156..ebae3fdd23 100644
--- a/examples/ipc/localfortuneserver/main.cpp
+++ b/examples/ipc/localfortuneserver/main.cpp
@@ -49,11 +49,7 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Server server;
-#if defined(Q_WS_S60)
- server.showMaximized();
-#else
server.show();
-#endif
qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
return app.exec();
}
diff --git a/examples/ipc/localfortuneserver/server.cpp b/examples/ipc/localfortuneserver/server.cpp
index e68e5de457..684c81fc92 100644
--- a/examples/ipc/localfortuneserver/server.cpp
+++ b/examples/ipc/localfortuneserver/server.cpp
@@ -48,11 +48,7 @@
#include <qlocalsocket.h>
Server::Server(QWidget *parent)
-#ifdef Q_WS_MAEMO_5
- : QWidget(parent)
-#else
: QDialog(parent)
-#endif
{
statusLabel = new QLabel;
statusLabel->setWordWrap(true);
diff --git a/examples/ipc/localfortuneserver/server.h b/examples/ipc/localfortuneserver/server.h
index 313862cfaa..5f00ba4d2d 100644
--- a/examples/ipc/localfortuneserver/server.h
+++ b/examples/ipc/localfortuneserver/server.h
@@ -41,11 +41,7 @@
#ifndef SERVER_H
#define SERVER_H
-#ifdef Q_WS_MAEMO_5
-#include <QWidget>
-#else
#include <QDialog>
-#endif
QT_BEGIN_NAMESPACE
class QLabel;
@@ -53,11 +49,7 @@ class QPushButton;
class QLocalServer;
QT_END_NAMESPACE
-#ifdef Q_WS_MAEMO_5
-class Server : public QWidget
-#else
class Server : public QDialog
-#endif
{
Q_OBJECT
diff --git a/examples/ipc/sharedmemory/sharedmemory.pro b/examples/ipc/sharedmemory/sharedmemory.pro
index 7c5b5dcd29..d11e16e4c6 100644
--- a/examples/ipc/sharedmemory/sharedmemory.pro
+++ b/examples/ipc/sharedmemory/sharedmemory.pro
@@ -12,10 +12,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc/sharedmemory
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
-symbian: warning(This example does not work on Symbian platform)
-maemo5: warning(This example does not work on Maemo platform)
simulator: warning(This example does not work on Simulator platform)