summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSzabolcs David <davidsz@inf.u-szeged.hu>2015-04-30 03:52:13 -0700
committerSzabolcs David <davidsz@inf.u-szeged.hu>2015-04-30 13:30:29 +0000
commit07bf8d7c73fba7bc7d9a6fd120f72cecad787088 (patch)
tree02ee457b117d7b24e7f9a3d6ea8b6e3df995ee05
parent8d23e37c8d85bf25924ae95af1ae409b2b0feafc (diff)
Remove Q_UNREACHABLE from DesktopScreenQt::GetDisplayNearestWindow
Chromium uses this method when the user attempts to drag. Task-number: QTBUG-45723 Change-Id: Ibe3946846f0f4e2d2a25ca36e66fa7235d4aecea Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
-rw-r--r--src/core/desktop_screen_qt.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/desktop_screen_qt.cpp b/src/core/desktop_screen_qt.cpp
index 6469ad8c..720cd1fa 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();
}