diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-17 12:20:46 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-01-17 15:56:28 +0000 |
| commit | 71d6dc0c326523103dff867d7184e7bc7e49c71d (patch) | |
| tree | f28f83359516f688313632b33b218185733746fa /src/core/content_browser_client_qt.cpp | |
| parent | 51ac6916f600eac67486ff272e48360c751237c9 (diff) | |
| parent | 2c6e6b86ef0a6c63297f9d5daa41c294aaf31a9b (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev
Diffstat (limited to 'src/core/content_browser_client_qt.cpp')
| -rw-r--r-- | src/core/content_browser_client_qt.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index 328dcd38d..d0019e4f3 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -105,6 +105,10 @@ #include "web_engine_context.h" #include "web_engine_library_info.h" +#if defined(Q_OS_WIN) +#include "ui/display/win/screen_win.h" +#endif + #if defined(Q_OS_LINUX) #include "global_descriptors_qt.h" #include "ui/base/resource/resource_bundle.h" @@ -295,8 +299,11 @@ public: { base::ThreadRestrictions::SetIOAllowed(true); // Like ChromeBrowserMainExtraPartsViews::PreCreateThreads does. +#if defined(Q_OS_WIN) + display::Screen::SetScreenInstance(new display::win::ScreenWin); +#else display::Screen::SetScreenInstance(new DesktopScreenQt); - +#endif return 0; } |