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/bearermonitor | |
| 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/bearermonitor')
| -rw-r--r-- | examples/network/bearermonitor/bearermonitor.cpp | 3 | ||||
| -rw-r--r-- | examples/network/bearermonitor/bearermonitor.h | 10 | ||||
| -rw-r--r-- | examples/network/bearermonitor/bearermonitor.pro | 8 |
3 files changed, 1 insertions, 20 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) |