diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 16:25:06 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-06-14 12:41:26 +0000 |
| commit | 917f862ebfd0a1797786c7c663acb83ff9144cde (patch) | |
| tree | 0da1e7fe38e7bea037394dca84d300d0abe21318 /src/core/desktop_screen_qt.cpp | |
| parent | fa19227c3ac7df7c0d2f8a548a9a36ac9a7b803c (diff) | |
Adaptations for Chromium 57
Change-Id: Ia2756c1e9b13839c2330bd98cf953d47cbdac0dd
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/desktop_screen_qt.cpp')
| -rw-r--r-- | src/core/desktop_screen_qt.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/desktop_screen_qt.cpp b/src/core/desktop_screen_qt.cpp index 1f4c9730f..ec7b6ce98 100644 --- a/src/core/desktop_screen_qt.cpp +++ b/src/core/desktop_screen_qt.cpp @@ -70,10 +70,11 @@ int DesktopScreenQt::GetNumDisplays() const return 0; } -std::vector<display::Display> DesktopScreenQt::GetAllDisplays() const +std::vector<display::Display>& DesktopScreenQt::GetAllDisplays() const { Q_UNREACHABLE(); - return std::vector<display::Display>(); + static std::vector<display::Display> empty; + return empty; } display::Display DesktopScreenQt::GetDisplayNearestWindow(gfx::NativeView window) const |