diff options
| author | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-09-06 01:08:03 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-09-07 20:36:06 +0000 |
| commit | b025577334081d73d1b3f17869f6946679ed3000 (patch) | |
| tree | d3b9daaaf2ec26f4e55dff57b7d8085440f180f6 /examples | |
| parent | 1734950ef6d5876fcc58ce9fdec75bd5c641f5ec (diff) | |
Fix broken signal/slot connections in browser example on OS X.
Change-Id: Ic5b7e149e0ff9165a7244aab5d5249c5ca856747
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/webenginewidgets/demobrowser/browserapplication.cpp | 9 | ||||
| -rw-r--r-- | examples/webenginewidgets/demobrowser/browserapplication.h | 2 |
2 files changed, 4 insertions, 7 deletions
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: |