From 35216895ea5b2093b6f4cbbfad8c925bcc25bb66 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Tue, 4 Nov 2014 09:53:15 +0100
Subject: [PATCH] Fix URLs in examples.
Change-Id: I528b7c4c22a1c47f54fe1b78a9d781a6af9cfc6b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
---
examples/webengine/quicknanobrowser/util.h | 2 +-
.../webenginewidgets/browser/browsermainwindow.cpp | 4 +++-
examples/webenginewidgets/browser/browsermainwindow.h | 2 ++
.../browser/data/defaultbookmarks.xbel | 11 ++++-------
examples/webenginewidgets/browser/settings.cpp | 2 +-
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/examples/webengine/quicknanobrowser/util.h b/examples/webengine/quicknanobrowser/util.h
index bad41d6a7..bc1cf8beb 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 587e66490..cce603cff 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 6743d8e79..da767e35e 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 7a95e36b3..a981d2de2 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 d89c49353..835e7a9b5 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();
--
GitLab