diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-07-24 11:47:04 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-25 14:30:14 +0200 |
| commit | b0cca9bdd0acf0865a1a5fcb0c51944d902638b1 (patch) | |
| tree | 44f877493c3ee613dcb34dd9d0412d52fa3a41d9 /examples/nfc | |
| parent | 0f677d485e83abd1e1d6f64b6220948fed421d94 (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/nfc')
| -rw-r--r-- | examples/nfc/annotatedurl/main.cpp | 4 | ||||
| -rw-r--r-- | examples/nfc/ndefeditor/main.cpp | 4 | ||||
| -rw-r--r-- | examples/nfc/poster/qmlposter.cpp | 4 |
3 files changed, 0 insertions, 12 deletions
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(); } |