summaryrefslogtreecommitdiffstats
path: root/examples/webenginewidgets/demobrowser
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-03-28 09:51:47 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-03-28 09:52:01 +0200
commit534c6dd960dc627040aba0cf2039e70ac92fa73a (patch)
treeab476d719b41bcc4580a63602eee0dc630914584 /examples/webenginewidgets/demobrowser
parent933301de6e70ba4b42d36f69da95f9a4de40150a (diff)
parent140d12802c9ebc54f5816fbf1a410c5bdc730ec6 (diff)
Merge remote-tracking branch 'origin/5.9' into dev
Diffstat (limited to 'examples/webenginewidgets/demobrowser')
-rw-r--r--examples/webenginewidgets/demobrowser/browserapplication.cpp2
-rw-r--r--examples/webenginewidgets/demobrowser/tabwidget.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/webenginewidgets/demobrowser/browserapplication.cpp b/examples/webenginewidgets/demobrowser/browserapplication.cpp
index 26764b93c..995626bb9 100644
--- a/examples/webenginewidgets/demobrowser/browserapplication.cpp
+++ b/examples/webenginewidgets/demobrowser/browserapplication.cpp
@@ -577,7 +577,7 @@ void BrowserApplication::setPrivateBrowsing(bool privateBrowsing)
} else {
Q_FOREACH (BrowserMainWindow* window, mainWindows()) {
window->tabWidget()->setProfile(QWebEngineProfile::defaultProfile());
- window->m_lastSearch = QString::null;
+ window->m_lastSearch = QString();
window->tabWidget()->clear();
}
}
diff --git a/examples/webenginewidgets/demobrowser/tabwidget.cpp b/examples/webenginewidgets/demobrowser/tabwidget.cpp
index c877e021e..aa730d1b6 100644
--- a/examples/webenginewidgets/demobrowser/tabwidget.cpp
+++ b/examples/webenginewidgets/demobrowser/tabwidget.cpp
@@ -882,7 +882,7 @@ QByteArray TabWidget::saveState() const
if (WebView *tab = qobject_cast<WebView*>(widget(i))) {
tabs.append(tab->url().toString());
} else {
- tabs.append(QString::null);
+ tabs.append(QString());
}
}
stream << tabs;