diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-08-11 10:18:08 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-08-14 11:42:09 +0200 |
| commit | 1ec53868363c41a4f08ca2660638da532eb56b10 (patch) | |
| tree | ac982148b467a63e7d1ceb2a7f943c3f3f5bf8d0 /examples/webenginewidgets/simplebrowser/browser.h | |
| parent | 49b94b14d3da42f945f6d49a3288c3ede5b98d36 (diff) | |
| parent | 59e35e033b8c8327db5b3fdbfb5d6ecee48a4405 (diff) | |
| download | qtwebengine-1ec53868363c41a4f08ca2660638da532eb56b10.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Includes sha1 bump of src/3rdparty to head of 58-based.
Change-Id: I37743c3979c1b6fb21f71eab7048e82f7aa5d78b
Diffstat (limited to 'examples/webenginewidgets/simplebrowser/browser.h')
| -rw-r--r-- | examples/webenginewidgets/simplebrowser/browser.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/examples/webenginewidgets/simplebrowser/browser.h b/examples/webenginewidgets/simplebrowser/browser.h index 0fdbd46a7..27e2aaf43 100644 --- a/examples/webenginewidgets/simplebrowser/browser.h +++ b/examples/webenginewidgets/simplebrowser/browser.h @@ -41,6 +41,8 @@ #ifndef BROWSER_H #define BROWSER_H +#include "downloadmanagerwidget.h" + #include <QVector> class BrowserWindow; @@ -48,14 +50,16 @@ class BrowserWindow; class Browser { public: - ~Browser(); + Browser(); + + QVector<BrowserWindow*> windows() { return m_windows; } - QVector<BrowserWindow*> windows(); - void addWindow(BrowserWindow* window); - static Browser &instance(); + BrowserWindow *createWindow(); + + DownloadManagerWidget &downloadManagerWidget() { return m_downloadManagerWidget; } private: - Browser(); QVector<BrowserWindow*> m_windows; + DownloadManagerWidget m_downloadManagerWidget; }; #endif // BROWSER_H |