diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-11-11 11:24:20 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-11-11 11:24:20 +0100 |
| commit | c254868dc2bd5772494a48686ebbc3e867a86adf (patch) | |
| tree | 76c33df85ab2ef13e44f7677b43439c7b0d3b36a /examples/webenginewidgets/browser/browsermainwindow.cpp | |
| parent | fca9015175950b04bafb9b3af7d4e693eb0243d9 (diff) | |
| parent | aa1b2d20a80f53ce5e7f6097114d41a018d9350b (diff) | |
| download | qtwebengine-c254868dc2bd5772494a48686ebbc3e867a86adf.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/core/browser_context_qt.cpp
src/webengine/api/qquickwebengineview_p.h
Change-Id: I73bdec03b627b282851d7dda12006d4ab631072c
Diffstat (limited to 'examples/webenginewidgets/browser/browsermainwindow.cpp')
| -rw-r--r-- | examples/webenginewidgets/browser/browsermainwindow.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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); } |