From b025577334081d73d1b3f17869f6946679ed3000 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@theqtcompany.com>
Date: Sun, 6 Sep 2015 01:08:03 -0700
Subject: Fix broken signal/slot connections in browser example on OS X.

Change-Id: Ic5b7e149e0ff9165a7244aab5d5249c5ca856747
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
---
 examples/webenginewidgets/demobrowser/browserapplication.cpp | 9 ++++-----
 examples/webenginewidgets/demobrowser/browserapplication.h   | 2 --
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'examples/webenginewidgets')

diff --git a/examples/webenginewidgets/demobrowser/browserapplication.cpp b/examples/webenginewidgets/demobrowser/browserapplication.cpp
index 4a2a5e70e..84ce35d9d 100644
--- a/examples/webenginewidgets/demobrowser/browserapplication.cpp
+++ b/examples/webenginewidgets/demobrowser/browserapplication.cpp
@@ -190,25 +190,24 @@ BrowserApplication::~BrowserApplication()
     delete s_bookmarksManager;
 }
 
-#if defined(Q_OS_OSX)
 void BrowserApplication::lastWindowClosed()
 {
+#if defined(Q_OS_OSX)
     clean();
     BrowserMainWindow *mw = new BrowserMainWindow;
     mw->slotHome();
     m_mainWindows.prepend(mw);
-}
 #endif
+}
 
 BrowserApplication *BrowserApplication::instance()
 {
     return (static_cast<BrowserApplication *>(QCoreApplication::instance()));
 }
 
-#if defined(Q_OS_OSX)
-#include <QtWidgets/QMessageBox>
 void BrowserApplication::quitBrowser()
 {
+#if defined(Q_OS_OSX)
     clean();
     int tabCount = 0;
     for (int i = 0; i < m_mainWindows.count(); ++i) {
@@ -226,8 +225,8 @@ void BrowserApplication::quitBrowser()
     }
 
     exit(0);
-}
 #endif
+}
 
 /*!
     Any actions that can be delayed until the window is visible
diff --git a/examples/webenginewidgets/demobrowser/browserapplication.h b/examples/webenginewidgets/demobrowser/browserapplication.h
index 26557b8f9..dd3045bc9 100644
--- a/examples/webenginewidgets/demobrowser/browserapplication.h
+++ b/examples/webenginewidgets/demobrowser/browserapplication.h
@@ -93,10 +93,8 @@ public:
 public slots:
     BrowserMainWindow *newMainWindow();
     void restoreLastSession();
-#if defined(Q_OS_OSX)
     void lastWindowClosed();
     void quitBrowser();
-#endif
     void setPrivateBrowsing(bool);
 
 signals:
-- 
cgit v1.2.3