Index: trunk/demos/embedded/anomaly/src/AddressBar.cpp
===================================================================
--- trunk/demos/embedded/anomaly/src/AddressBar.cpp	(revision 769)
+++ trunk/demos/embedded/anomaly/src/AddressBar.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -45,25 +45,9 @@
 #include <QtGui>
 
-class LineEdit: public QLineEdit
-{
-public:
-    LineEdit(QWidget *parent = 0): QLineEdit(parent) {}
-
-    void paintEvent(QPaintEvent *event) {
-        QLineEdit::paintEvent(event);
-        if (text().isEmpty()) {
-            QPainter p(this);
-            int flags = Qt::AlignLeft | Qt::AlignVCenter;
-            p.setPen(palette().color(QPalette::Disabled, QPalette::Text));
-            p.drawText(rect().adjusted(10, 0, 0, 0), flags, "Enter address or search terms");
-            p.end();
-        }
-    }
-};
-
 AddressBar::AddressBar(QWidget *parent)
     : QWidget(parent)
 {
-    m_lineEdit = new LineEdit(parent);
+    m_lineEdit = new QLineEdit(parent);
+    m_lineEdit->setPlaceholderText("Enter address or search terms");
     connect(m_lineEdit, SIGNAL(returnPressed()), SLOT(processAddress()));
     m_toolButton = new QToolButton(parent);
Index: trunk/demos/embedded/anomaly/src/AddressBar.h
===================================================================
--- trunk/demos/embedded/anomaly/src/AddressBar.h	(revision 769)
+++ trunk/demos/embedded/anomaly/src/AddressBar.h	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/demos/embedded/anomaly/src/BookmarksView.cpp
===================================================================
--- trunk/demos/embedded/anomaly/src/BookmarksView.cpp	(revision 769)
+++ trunk/demos/embedded/anomaly/src/BookmarksView.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -56,5 +56,5 @@
     m_iconView->addItem("www.google.com");
     m_iconView->addItem("qt.nokia.com/doc/4.5");
-    m_iconView->addItem("news.bbc.co.uk/text_only.stm");
+    m_iconView->addItem("news.bbc.co.uk/2/mobile/default.stm");
     m_iconView->addItem("mobile.wikipedia.org");
     m_iconView->addItem("qt.nokia.com");
Index: trunk/demos/embedded/anomaly/src/BookmarksView.h
===================================================================
--- trunk/demos/embedded/anomaly/src/BookmarksView.h	(revision 769)
+++ trunk/demos/embedded/anomaly/src/BookmarksView.h	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/demos/embedded/anomaly/src/BrowserView.cpp
===================================================================
--- trunk/demos/embedded/anomaly/src/BrowserView.cpp	(revision 769)
+++ trunk/demos/embedded/anomaly/src/BrowserView.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -52,8 +52,4 @@
 #include "ZoomStrip.h"
 
-#if defined (Q_OS_SYMBIAN)
-#include "sym_iap_util.h"
-#endif
-
 BrowserView::BrowserView(QWidget *parent)
     : QWidget(parent)
@@ -71,4 +67,24 @@
     m_zoomLevels << 100;
     m_zoomLevels << 110 << 120 << 133 << 150 << 170 << 200 << 240 << 300;
+
+    QNetworkConfigurationManager manager;
+    if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) {
+        // Get saved network configuration
+        QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
+        settings.beginGroup(QLatin1String("QtNetwork"));
+        const QString id =
+            settings.value(QLatin1String("DefaultNetworkConfiguration")).toString();
+        settings.endGroup();
+
+        // If the saved network configuration is not currently discovered use the system
+        // default
+        QNetworkConfiguration config = manager.configurationFromIdentifier(id);
+        if ((config.state() & QNetworkConfiguration::Discovered) !=
+            QNetworkConfiguration::Discovered) {
+            config = manager.defaultConfiguration();
+        }
+
+        m_webView->page()->networkAccessManager()->setConfiguration(config);
+    }
 
     QTimer::singleShot(0, this, SLOT(initialize()));
@@ -101,7 +117,4 @@
     m_webView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     m_webView->setFocus();
-#ifdef Q_OS_SYMBIAN
-    QTimer::singleShot(0, this, SLOT(setDefaultIap()));
-#endif
 }
 
@@ -174,11 +187,4 @@
     m_zoomStrip->move(width() - zw, (height() - zh) / 2);
 }
-#ifdef Q_OS_SYMBIAN
-void BrowserView::setDefaultIap()
-{
-    qt_SetDefaultIap();
-    m_webView->load(QUrl("http://news.bbc.co.uk/text_only.stm"));
-}
-#endif
 
 void BrowserView::navigate(const QUrl &url)
Index: trunk/demos/embedded/anomaly/src/BrowserView.h
===================================================================
--- trunk/demos/embedded/anomaly/src/BrowserView.h	(revision 769)
+++ trunk/demos/embedded/anomaly/src/BrowserView.h	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -64,7 +64,4 @@
     void zoomIn();
     void zoomOut();
-#ifdef Q_OS_SYMBIAN
-    void setDefaultIap();
-#endif
 
 private slots:
Index: trunk/demos/embedded/anomaly/src/BrowserWindow.cpp
===================================================================
--- trunk/demos/embedded/anomaly/src/BrowserWindow.cpp	(revision 769)
+++ trunk/demos/embedded/anomaly/src/BrowserWindow.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/demos/embedded/anomaly/src/BrowserWindow.h
===================================================================
--- trunk/demos/embedded/anomaly/src/BrowserWindow.h	(revision 769)
+++ trunk/demos/embedded/anomaly/src/BrowserWindow.h	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/demos/embedded/anomaly/src/ControlStrip.cpp
===================================================================
--- trunk/demos/embedded/anomaly/src/ControlStrip.cpp	(revision 769)
+++ trunk/demos/embedded/anomaly/src/ControlStrip.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/demos/embedded/anomaly/src/ControlStrip.h
===================================================================
--- trunk/demos/embedded/anomaly/src/ControlStrip.h	(revision 769)
+++ trunk/demos/embedded/anomaly/src/ControlStrip.h	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/demos/embedded/anomaly/src/HomeView.cpp
===================================================================
--- trunk/demos/embedded/anomaly/src/HomeView.cpp	(revision 769)
+++ trunk/demos/embedded/anomaly/src/HomeView.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/demos/embedded/anomaly/src/HomeView.h
===================================================================
--- trunk/demos/embedded/anomaly/src/HomeView.h	(revision 769)
+++ trunk/demos/embedded/anomaly/src/HomeView.h	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/demos/embedded/anomaly/src/Main.cpp
===================================================================
--- trunk/demos/embedded/anomaly/src/Main.cpp	(revision 769)
+++ trunk/demos/embedded/anomaly/src/Main.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/demos/embedded/anomaly/src/TitleBar.cpp
===================================================================
--- trunk/demos/embedded/anomaly/src/TitleBar.cpp	(revision 769)
+++ trunk/demos/embedded/anomaly/src/TitleBar.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/demos/embedded/anomaly/src/TitleBar.h
===================================================================
--- trunk/demos/embedded/anomaly/src/TitleBar.h	(revision 769)
+++ trunk/demos/embedded/anomaly/src/TitleBar.h	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/demos/embedded/anomaly/src/ZoomStrip.cpp
===================================================================
--- trunk/demos/embedded/anomaly/src/ZoomStrip.cpp	(revision 769)
+++ trunk/demos/embedded/anomaly/src/ZoomStrip.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/demos/embedded/anomaly/src/ZoomStrip.h
===================================================================
--- trunk/demos/embedded/anomaly/src/ZoomStrip.h	(revision 769)
+++ trunk/demos/embedded/anomaly/src/ZoomStrip.h	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/demos/embedded/anomaly/src/flickcharm.cpp
===================================================================
--- trunk/demos/embedded/anomaly/src/flickcharm.cpp	(revision 769)
+++ trunk/demos/embedded/anomaly/src/flickcharm.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/demos/embedded/anomaly/src/flickcharm.h
===================================================================
--- trunk/demos/embedded/anomaly/src/flickcharm.h	(revision 769)
+++ trunk/demos/embedded/anomaly/src/flickcharm.h	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/demos/embedded/anomaly/src/webview.cpp
===================================================================
--- trunk/demos/embedded/anomaly/src/webview.cpp	(revision 769)
+++ trunk/demos/embedded/anomaly/src/webview.cpp	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
Index: trunk/demos/embedded/anomaly/src/webview.h
===================================================================
--- trunk/demos/embedded/anomaly/src/webview.h	(revision 769)
+++ trunk/demos/embedded/anomaly/src/webview.h	(revision 846)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
