diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-07-01 07:12:38 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-07-01 07:12:38 (GMT) |
| commit | 5180e192c2fdb7735aa062e35179415de40834a2 (patch) | |
| tree | d647811d418aa4e9fd590d9af852072e0cbed1ed /demos | |
| parent | 922493a72c033a43f59caebcd8ce7fe060df0d4c (diff) | |
| parent | d3ae6c620876e08ed130606709c208f7352b2f81 (diff) | |
| download | Qt-5180e192c2fdb7735aa062e35179415de40834a2.zip Qt-5180e192c2fdb7735aa062e35179415de40834a2.tar.gz Qt-5180e192c2fdb7735aa062e35179415de40834a2.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/embedded/anomaly/src/BookmarksView.cpp | 2 | ||||
| -rw-r--r-- | demos/embedded/anomaly/src/BrowserView.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/demos/embedded/anomaly/src/BookmarksView.cpp b/demos/embedded/anomaly/src/BookmarksView.cpp index 729bf73..d6e6035 100644 --- a/demos/embedded/anomaly/src/BookmarksView.cpp +++ b/demos/embedded/anomaly/src/BookmarksView.cpp @@ -55,7 +55,7 @@ BookmarksView::BookmarksView(QWidget *parent) 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"); m_iconView->addItem("en.wikipedia.org"); diff --git a/demos/embedded/anomaly/src/BrowserView.cpp b/demos/embedded/anomaly/src/BrowserView.cpp index 41318ad..a6e6f7a 100644 --- a/demos/embedded/anomaly/src/BrowserView.cpp +++ b/demos/embedded/anomaly/src/BrowserView.cpp @@ -177,7 +177,6 @@ void BrowserView::resizeEvent(QResizeEvent *event) void BrowserView::setDefaultIap() { qt_SetDefaultIap(); - m_webView->load(QUrl("http://news.bbc.co.uk/text_only.stm")); } #endif |