summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2013-07-24 11:47:04 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-25 14:30:14 +0200
commitb0cca9bdd0acf0865a1a5fcb0c51944d902638b1 (patch)
tree44f877493c3ee613dcb34dd9d0412d52fa3a41d9 /examples
parent0f677d485e83abd1e1d6f64b6220948fed421d94 (diff)
Remove code related to dead or currently unsupported platforms
- Removes the Meego/Maemo backend for QtNfc - Remove Simulator, WinCE and S60 remnants from the examples If any of these platforms becomes relevant they can be added back of course. Change-Id: I84712ea07f01794b622560ce77e08cee347406e3 Reviewed-by: Michael Zanetti <michael.zanetti@canonical.com> Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Alex <alexander.blasche@digia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/bluetooth/btchat/chat.cpp4
-rw-r--r--examples/bluetooth/btchat/main.cpp4
-rw-r--r--examples/bluetooth/btchat/remoteselector.cpp4
-rw-r--r--examples/bluetooth/btscanner/device.cpp4
-rw-r--r--examples/bluetooth/btscanner/service.cpp4
-rw-r--r--examples/bluetooth/bttennis/main.cpp4
-rw-r--r--examples/bluetooth/bttennis/tennis.cpp4
-rw-r--r--examples/bluetooth/scanner/qmlscanner.cpp4
-rw-r--r--examples/nfc/annotatedurl/main.cpp4
-rw-r--r--examples/nfc/ndefeditor/main.cpp4
-rw-r--r--examples/nfc/poster/qmlposter.cpp4
11 files changed, 0 insertions, 44 deletions
diff --git a/examples/bluetooth/btchat/chat.cpp b/examples/bluetooth/btchat/chat.cpp
index fbb38761..1d4e57eb 100644
--- a/examples/bluetooth/btchat/chat.cpp
+++ b/examples/bluetooth/btchat/chat.cpp
@@ -61,10 +61,6 @@ Chat::Chat(QWidget *parent)
//! [Construct UI]
ui->setupUi(this);
-#if defined(Q_OS_WINCE) || defined(Q_WS_MAEMO_6)
- setWindowState(Qt::WindowFullScreen);
-#endif
-
connect(ui->quitButton, SIGNAL(clicked()), this, SLOT(accept()));
connect(ui->connectButton, SIGNAL(clicked()), this, SLOT(connectClicked()));
connect(ui->sendButton, SIGNAL(clicked()), this, SLOT(sendClicked()));
diff --git a/examples/bluetooth/btchat/main.cpp b/examples/bluetooth/btchat/main.cpp
index 00a03d96..ac23a11d 100644
--- a/examples/bluetooth/btchat/main.cpp
+++ b/examples/bluetooth/btchat/main.cpp
@@ -49,11 +49,7 @@ int main(int argc, char *argv[])
Chat d;
QObject::connect(&d, SIGNAL(accepted()), &app, SLOT(quit()));
-#if defined(Q_WS_MAEMO_6)
- d.showFullScreen();
-#else
d.show();
-#endif
app.exec();
diff --git a/examples/bluetooth/btchat/remoteselector.cpp b/examples/bluetooth/btchat/remoteselector.cpp
index 7937f0cb..50bebcd3 100644
--- a/examples/bluetooth/btchat/remoteselector.cpp
+++ b/examples/bluetooth/btchat/remoteselector.cpp
@@ -52,10 +52,6 @@ RemoteSelector::RemoteSelector(QWidget *parent)
{
ui->setupUi(this);
-#if defined(Q_OS_WINCE) || defined(Q_WS_MAEMO_6)
- setWindowState(Qt::WindowFullScreen);
-#endif
-
connect(m_discoveryAgent, SIGNAL(serviceDiscovered(QBluetoothServiceInfo)),
this, SLOT(serviceDiscovered(QBluetoothServiceInfo)));
connect(m_discoveryAgent, SIGNAL(finished()), this, SLOT(discoveryFinished()));
diff --git a/examples/bluetooth/btscanner/device.cpp b/examples/bluetooth/btscanner/device.cpp
index 002427bd..1437f612 100644
--- a/examples/bluetooth/btscanner/device.cpp
+++ b/examples/bluetooth/btscanner/device.cpp
@@ -54,10 +54,6 @@ DeviceDiscoveryDialog::DeviceDiscoveryDialog(QWidget *parent)
{
ui->setupUi(this);
-#if defined(Q_OS_WINCE) || defined(Q_WS_MAEMO_6)
- setWindowState(Qt::WindowFullScreen);
-#endif
-
connect(ui->inquiryType, SIGNAL(toggled(bool)), this, SLOT(setGeneralUnlimited(bool)));
connect(ui->scan, SIGNAL(clicked()), this, SLOT(startScan()));
diff --git a/examples/bluetooth/btscanner/service.cpp b/examples/bluetooth/btscanner/service.cpp
index 23382c82..7718f518 100644
--- a/examples/bluetooth/btscanner/service.cpp
+++ b/examples/bluetooth/btscanner/service.cpp
@@ -52,10 +52,6 @@ ServiceDiscoveryDialog::ServiceDiscoveryDialog(const QString &name,
{
ui->setupUi(this);
-#if defined(Q_OS_WINCE) || defined(Q_WS_MAEMO_6)
- setWindowState(Qt::WindowMaximized);
-#endif
-
setWindowTitle(name);
connect(discoveryAgent, SIGNAL(serviceDiscovered(const QBluetoothServiceInfo&)),
diff --git a/examples/bluetooth/bttennis/main.cpp b/examples/bluetooth/bttennis/main.cpp
index 620ebbb7..c90807bd 100644
--- a/examples/bluetooth/bttennis/main.cpp
+++ b/examples/bluetooth/bttennis/main.cpp
@@ -50,11 +50,7 @@ int main(int argc, char *argv[])
Tennis d;
QObject::connect(&d, SIGNAL(accepted()), &app, SLOT(quit()));
-#if defined(Q_WS_MAEMO_6)
- d.showFullScreen();
-#else
d.show();
-#endif
app.exec();
diff --git a/examples/bluetooth/bttennis/tennis.cpp b/examples/bluetooth/bttennis/tennis.cpp
index cb0033e1..bec62aa0 100644
--- a/examples/bluetooth/bttennis/tennis.cpp
+++ b/examples/bluetooth/bttennis/tennis.cpp
@@ -82,10 +82,6 @@ Tennis::Tennis(QWidget *parent)
isConnected = false;
quickDiscovery = true;
-#if defined(Q_OS_WINCE) || defined(Q_WS_MAEMO_6)
- setWindowState(Qt::WindowMaximized);
-#endif
-
ui->pongView->setScene(board->getScene());
connect(ui->pongView, SIGNAL(mouseMove(int, int)), this, SLOT(mouseMove(int, int)));
diff --git a/examples/bluetooth/scanner/qmlscanner.cpp b/examples/bluetooth/scanner/qmlscanner.cpp
index a5b1107e..3602674b 100644
--- a/examples/bluetooth/scanner/qmlscanner.cpp
+++ b/examples/bluetooth/scanner/qmlscanner.cpp
@@ -52,11 +52,7 @@ int main(int argc, char *argv[])
// Qt.quit() called in embedded .qml by default only emits
// quit() signal, so do this (optionally use Qt.exit()).
QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit()));
-#if defined(Q_WS_MAEMO_6)
- view.showFullScreen();
-#else
view.setGeometry(QRect(100, 100, 360, 640));
view.show();
-#endif
return application.exec();
}
diff --git a/examples/nfc/annotatedurl/main.cpp b/examples/nfc/annotatedurl/main.cpp
index 001cc399..c669e57b 100644
--- a/examples/nfc/annotatedurl/main.cpp
+++ b/examples/nfc/annotatedurl/main.cpp
@@ -70,11 +70,7 @@ int main(int argc, char *argv[])
QObject::connect(&annotatedUrl, SIGNAL(annotatedUrl(QUrl,QString,QPixmap)),
&mainWindow, SLOT(displayAnnotatedUrl(QUrl,QString,QPixmap)));
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_6) || defined(Q_WS_MEEGO)
- mainWindow.showFullScreen();
-#else
mainWindow.show();
-#endif
return a.exec();
}
diff --git a/examples/nfc/ndefeditor/main.cpp b/examples/nfc/ndefeditor/main.cpp
index 85fd0791..05bc2bb1 100644
--- a/examples/nfc/ndefeditor/main.cpp
+++ b/examples/nfc/ndefeditor/main.cpp
@@ -46,11 +46,7 @@ int main(int argc, char *argv[])
QApplication a(argc, argv);
MainWindow w;
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_6) || defined(Q_WS_MEEGO)
- w.showFullScreen();
-#else
w.show();
-#endif
return a.exec();
}
diff --git a/examples/nfc/poster/qmlposter.cpp b/examples/nfc/poster/qmlposter.cpp
index 5da86b39..89f36956 100644
--- a/examples/nfc/poster/qmlposter.cpp
+++ b/examples/nfc/poster/qmlposter.cpp
@@ -52,11 +52,7 @@ int main(int argc, char *argv[])
// Qt.quit() called in embedded .qml by default only emits
// quit() signal, so do this (optionally use Qt.exit()).
QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit()));
-#if defined(Q_WS_MAEMO_6) || defined(Q_WS_SIMULATOR)
- view.showFullScreen();
-#else
view.setGeometry(QRect(100, 100, 640, 360));
view.show();
-#endif
return application.exec();
}