From 1b13d56f12b268eb3b92805a40d29312e392124b Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 7 Jun 2017 20:37:40 +0200 Subject: Revert "Fix flushing the cookies with demobrowser" Mea culpa ! This is not only not required in 5.9.1 but also does not even compile. This reverts commit dc70e81da3f7b639ace9c5cc14e1fd4eb1942e4c. Task-number: QTBUG-61299 Change-Id: I0879abe58a23588bddf9e4217899d7bfbf604438 Reviewed-by: Kai Koehne --- .../webenginewidgets/demobrowser/browserapplication.cpp | 15 ++++++--------- .../webenginewidgets/demobrowser/browsermainwindow.cpp | 5 +++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/examples/webenginewidgets/demobrowser/browserapplication.cpp b/examples/webenginewidgets/demobrowser/browserapplication.cpp index 04ae7cc03..32429a675 100644 --- a/examples/webenginewidgets/demobrowser/browserapplication.cpp +++ b/examples/webenginewidgets/demobrowser/browserapplication.cpp @@ -186,11 +186,12 @@ BrowserApplication::BrowserApplication(int &argc, char **argv) BrowserApplication::~BrowserApplication() { delete s_downloadManager; - s_downloadManager=nullptr; + for (int i = 0; i < m_mainWindows.size(); ++i) { + BrowserMainWindow *window = m_mainWindows.at(i); + delete window; + } delete s_networkAccessManager; - s_networkAccessManager=nullptr; delete s_bookmarksManager; - s_bookmarksManager=nullptr; } void BrowserApplication::lastWindowClosed() @@ -226,13 +227,9 @@ void BrowserApplication::quitBrowser() if (ret == QMessageBox::No) return; } + + exit(0); #endif - for (int i = 0; i < m_mainWindows.size(); ++i) { - BrowserMainWindow *window = m_mainWindows.at(i); - delete window; - } - m_mainWindows.clear(); - close(); } /*! diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp index cf1b18240..327d7a9d3 100644 --- a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp +++ b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp @@ -323,7 +323,12 @@ void BrowserMainWindow::setupMenu() action->setChecked(BrowserApplication::instance()->privateBrowsing()); connect(BrowserApplication::instance(), SIGNAL(privateBrowsingChanged(bool)), action, SLOT(setChecked(bool))); fileMenu->addSeparator(); + +#if defined(Q_OS_OSX) fileMenu->addAction(tr("&Quit"), BrowserApplication::instance(), SLOT(quitBrowser()), QKeySequence(Qt::CTRL | Qt::Key_Q)); +#else + fileMenu->addAction(tr("&Quit"), this, SLOT(close()), QKeySequence(Qt::CTRL | Qt::Key_Q)); +#endif // Edit QMenu *editMenu = menuBar()->addMenu(tr("&Edit")); -- cgit v1.2.3