diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-05-11 11:42:08 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-05-11 17:02:43 +0200 |
| commit | a1b6a4c9edab853f06b870d9ef60a50b28ca36a6 (patch) | |
| tree | abcdf44e8cb1bed6339de3fd4d28b86e0a7dba4d /src/core/desktop_screen_qt.cpp | |
| parent | 18cc8aa2893e62f2b2679e67ed4747243e25da35 (diff) | |
| parent | 76a990cfa3409214530e77d132cdefd9e96685f9 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I122ca8d3438333c6b41f751c47b1ce1f9a7066b9
Diffstat (limited to 'src/core/desktop_screen_qt.cpp')
| -rw-r--r-- | src/core/desktop_screen_qt.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/desktop_screen_qt.cpp b/src/core/desktop_screen_qt.cpp index 6469ad8c2..720cd1faf 100644 --- a/src/core/desktop_screen_qt.cpp +++ b/src/core/desktop_screen_qt.cpp @@ -70,7 +70,8 @@ std::vector<gfx::Display> DesktopScreenQt::GetAllDisplays() const gfx::Display DesktopScreenQt::GetDisplayNearestWindow(gfx::NativeView window) const { - Q_UNREACHABLE(); + // RenderViewHostImpl::OnStartDragging uses this to determine + // the scale factor for the view. return gfx::Display(); } |