diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-30 10:39:42 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-30 10:40:26 +0200 |
commit | 4181db05fc8f1c96d0bbf2e88a64e6d3bb11c6cf (patch) | |
tree | f4f9127216f92102f3420949f82e3186fee15e54 /examples/webenginewidgets/simplebrowser/browser.cpp | |
parent | b546cea1b5ba6721bf7fcb687c6c069d4442ba34 (diff) | |
parent | 26ac59af2306b4f6f83e791bb3e828b9f7b1a721 (diff) | |
download | qtwebengine-4181db05fc8f1c96d0bbf2e88a64e6d3bb11c6cf.tar.gz |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I051052a70a6e764202a90d77fc1a0f73688d3704
Diffstat (limited to 'examples/webenginewidgets/simplebrowser/browser.cpp')
-rw-r--r-- | examples/webenginewidgets/simplebrowser/browser.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/examples/webenginewidgets/simplebrowser/browser.cpp b/examples/webenginewidgets/simplebrowser/browser.cpp index 5c6dbd35e..68458b2a4 100644 --- a/examples/webenginewidgets/simplebrowser/browser.cpp +++ b/examples/webenginewidgets/simplebrowser/browser.cpp @@ -51,8 +51,6 @@ #include "browser.h" #include "browserwindow.h" -#include <QWebEngineProfile> - Browser::Browser() { // Quit application if the download manager window is the only remaining window @@ -61,14 +59,17 @@ Browser::Browser() QObject::connect( QWebEngineProfile::defaultProfile(), &QWebEngineProfile::downloadRequested, &m_downloadManagerWidget, &DownloadManagerWidget::downloadRequested); - QObject::connect( - &m_otrProfile, &QWebEngineProfile::downloadRequested, - &m_downloadManagerWidget, &DownloadManagerWidget::downloadRequested); } BrowserWindow *Browser::createWindow(bool offTheRecord) { - auto profile = offTheRecord ? &m_otrProfile : QWebEngineProfile::defaultProfile(); + if (offTheRecord && !m_otrProfile) { + m_otrProfile.reset(new QWebEngineProfile); + QObject::connect( + m_otrProfile.get(), &QWebEngineProfile::downloadRequested, + &m_downloadManagerWidget, &DownloadManagerWidget::downloadRequested); + } + auto profile = offTheRecord ? m_otrProfile.get() : QWebEngineProfile::defaultProfile(); auto mainWindow = new BrowserWindow(this, profile, false); m_windows.append(mainWindow); QObject::connect(mainWindow, &QObject::destroyed, [this, mainWindow]() { |