summaryrefslogtreecommitdiffstats
path: root/examples/xml/rsslisting
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/xml/rsslisting
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/xml/rsslisting')
-rw-r--r--examples/xml/rsslisting/main.cpp4
-rw-r--r--examples/xml/rsslisting/rsslisting.cpp19
-rw-r--r--examples/xml/rsslisting/rsslisting.h13
-rw-r--r--examples/xml/rsslisting/rsslisting.pro13
4 files changed, 0 insertions, 49 deletions
diff --git a/examples/xml/rsslisting/main.cpp b/examples/xml/rsslisting/main.cpp
index 7d2b4ca10f..a646c602db 100644
--- a/examples/xml/rsslisting/main.cpp
+++ b/examples/xml/rsslisting/main.cpp
@@ -58,10 +58,6 @@ int main(int argc, char **argv)
{
QApplication app(argc, argv);
RSSListing *rsslisting = new RSSListing;
-#if defined(Q_OS_SYMBIAN)
- rsslisting->showMaximized();
-#else
rsslisting->show();
-#endif
return app.exec();
}
diff --git a/examples/xml/rsslisting/rsslisting.cpp b/examples/xml/rsslisting/rsslisting.cpp
index ba9ff28072..4fa160f9ed 100644
--- a/examples/xml/rsslisting/rsslisting.cpp
+++ b/examples/xml/rsslisting/rsslisting.cpp
@@ -74,23 +74,6 @@ its operation, and also allows very large data sources to be read.
RSSListing::RSSListing(QWidget *parent)
: QWidget(parent), currentReply(0)
{
-#ifdef Q_OS_SYMBIAN
- // Set Internet Access Point
- QNetworkConfigurationManager manager;
- const bool canStartIAP = manager.capabilities() & QNetworkConfigurationManager::CanStartAndStopInterfaces;
-
- // Is there default access point, use it
- QNetworkConfiguration cfg = manager.defaultConfiguration();
- if (!cfg.isValid() || !canStartIAP) {
- // Available Access Points not found
- QMessageBox::warning(this, "Error", "No access point");
- return;
- }
-
- m_session = new QNetworkSession(cfg);
- m_session->open();
- m_session->waitForOpened();
-#endif
lineEdit = new QLineEdit(this);
lineEdit->setText("http://labs.qt.nokia.com/blogs/feed");
@@ -122,9 +105,7 @@ RSSListing::RSSListing(QWidget *parent)
layout->addWidget(treeWidget);
setWindowTitle(tr("RSS listing example"));
-#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5)
resize(640,480);
-#endif
}
/*
diff --git a/examples/xml/rsslisting/rsslisting.h b/examples/xml/rsslisting/rsslisting.h
index 49c694092c..22d222e2b9 100644
--- a/examples/xml/rsslisting/rsslisting.h
+++ b/examples/xml/rsslisting/rsslisting.h
@@ -48,15 +48,6 @@
#include <QXmlStreamReader>
#include <QUrl>
-#ifdef Q_OS_SYMBIAN
-// Bearer
-#include <QNetworkConfigurationManager>
-#include <QNetworkSession>
-#include <QPointer>
-
-// QtMobility namespace
-QTM_USE_NAMESPACE
-#endif
QT_BEGIN_NAMESPACE
class QLineEdit;
@@ -95,10 +86,6 @@ private:
QTreeWidget *treeWidget;
QPushButton *fetchButton;
-#ifdef Q_OS_SYMBIAN
- // for bearer management
- QPointer<QNetworkSession> m_session;
-#endif
};
#endif
diff --git a/examples/xml/rsslisting/rsslisting.pro b/examples/xml/rsslisting/rsslisting.pro
index 551be70db7..b0920cc8e7 100644
--- a/examples/xml/rsslisting/rsslisting.pro
+++ b/examples/xml/rsslisting/rsslisting.pro
@@ -7,16 +7,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/rsslisting
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS rsslisting.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/rsslisting
INSTALLS += target sources
-
-symbian {
- CONFIG += qt_example
-
- # For QtMobility
- CONFIG += mobility
- MOBILITY = bearer
-
- # For QtMobility
- TARGET.CAPABILITY = NetworkServices
-}
-
-maemo5: CONFIG += qt_example