diff --git a/examples/webengine/quicknanobrowser/util.h b/examples/webengine/quicknanobrowser/util.h index bad41d6a75023b5a69f6336552ad60cad504266d..bc1cf8beb95f7bd1f5ad7414645942e0540be871 100644 --- a/examples/webengine/quicknanobrowser/util.h +++ b/examples/webengine/quicknanobrowser/util.h @@ -66,7 +66,7 @@ QUrl startupUrl() if (ret.isValid()) return ret; } - return QUrl(QStringLiteral("http://qt-project.org/")); + return QUrl(QStringLiteral("http://qt.io/")); } diff --git a/examples/webenginewidgets/browser/browsermainwindow.cpp b/examples/webenginewidgets/browser/browsermainwindow.cpp index 587e664904b915c7b75dc30b66acc618b5bd5418..cce603cffdf415b591484fbf4e2cde3baea3d5db 100644 --- a/examples/webenginewidgets/browser/browsermainwindow.cpp +++ b/examples/webenginewidgets/browser/browsermainwindow.cpp @@ -88,6 +88,8 @@ InvokeWrapper<Arg, R, C> invoke(R *receiver, void (C::*memberFun)(Arg)) return wrapper; } +const char *BrowserMainWindow::defaultHome = "http://qt.io/"; + BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags) , m_tabWidget(new TabWidget(this)) @@ -825,7 +827,7 @@ void BrowserMainWindow::slotHome() { QSettings settings; settings.beginGroup(QLatin1String("MainWindow")); - QString home = settings.value(QLatin1String("home"), QLatin1String("http://qt-project.org/")).toString(); + QString home = settings.value(QLatin1String("home"), QLatin1String(defaultHome)).toString(); loadPage(home); } diff --git a/examples/webenginewidgets/browser/browsermainwindow.h b/examples/webenginewidgets/browser/browsermainwindow.h index 6743d8e7900d00e21c68c1a3d62b749e11cd27eb..da767e35e6b5538ccceb660b34b340b9175deba3 100644 --- a/examples/webenginewidgets/browser/browsermainwindow.h +++ b/examples/webenginewidgets/browser/browsermainwindow.h @@ -70,6 +70,8 @@ public: ~BrowserMainWindow(); QSize sizeHint() const; + static const char *defaultHome; + public: TabWidget *tabWidget() const; WebView *currentTab() const; diff --git a/examples/webenginewidgets/browser/data/defaultbookmarks.xbel b/examples/webenginewidgets/browser/data/defaultbookmarks.xbel index 7a95e36b3b7ea3642db3a9d412804ea220ec7461..a981d2de206206f26992d937969e7af7d2c542be 100644 --- a/examples/webenginewidgets/browser/data/defaultbookmarks.xbel +++ b/examples/webenginewidgets/browser/data/defaultbookmarks.xbel @@ -3,18 +3,12 @@ <xbel version="1.0"> <folder folded="yes"> <title>Bookmarks Bar</title> - <bookmark href="http://qt-project.org/"> + <bookmark href="http://qt.io/"> <title>Qt Home Page</title> </bookmark> - <bookmark href="http://webkit.org/"> - <title>WebKit.org</title> - </bookmark> <bookmark href="http://qt-project.org/doc/"> <title>Qt Documentation</title> </bookmark> - <bookmark href="http://qt-project.org/quarterly/"> - <title>Qt Quarterly</title> - </bookmark> <bookmark href="http://planet.qt-project.org/"> <title>Qt Blog</title> </bookmark> @@ -27,6 +21,9 @@ <bookmark href="http://qt-project.org/wiki/OnlineCommunities/"> <title>Online Communities</title> </bookmark> + <bookmark href="http://www.chromium.org/"> + <title>The Chromium Projects</title> + </bookmark> <bookmark href="http://xkcd.com/"> <title>xkcd</title> </bookmark> diff --git a/examples/webenginewidgets/browser/settings.cpp b/examples/webenginewidgets/browser/settings.cpp index d89c49353344a0bfe8745cc442b47fe9e391e9e7..835e7a9b5645766ef7ec292182e5046af6ff2558 100644 --- a/examples/webenginewidgets/browser/settings.cpp +++ b/examples/webenginewidgets/browser/settings.cpp @@ -95,7 +95,7 @@ void SettingsDialog::loadFromSettings() { QSettings settings; settings.beginGroup(QLatin1String("MainWindow")); - QString defaultHome = QLatin1String("http://qt-project.org/"); + const QString defaultHome = QLatin1String(BrowserMainWindow::defaultHome); homeLineEdit->setText(settings.value(QLatin1String("home"), defaultHome).toString()); settings.endGroup();