From fc1e202e776934f4d286b206c84ee9c82440f7b1 Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Wed, 28 Mar 2012 14:28:45 +0300 Subject: Fix compilation error on Solaris caused by ShapeInput Change: Icb2204a50a97e4a5e02e75301c67287525b290ba caused build error on Solaris as ShapeInput and ShapeBounding types are not present in default system headers. This patch is compile time fix for Solaris only. On Solaris the windowInteractsWithPosition function call is omitted as suggested by the author of the original change. Task-number: QTBUG-24653 Change-Id: I29d821867ec41e7d68b5bdc126f255dc682cc983 Reviewed-by: Albert Astals Cid Reviewed-by: Robin Burchell --- src/gui/kernel/qdnd_x11.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp index c4d2469..4a98419 100644 --- a/src/gui/kernel/qdnd_x11.cpp +++ b/src/gui/kernel/qdnd_x11.cpp @@ -1465,7 +1465,9 @@ Window findRealWindow(const QPoint & pos, Window w, int md) if (type) { // When ShapeInput and ShapeBounding are not set they return a single rectangle with the geometry of the window, this is why we // need an && here so that in the case one is set and the other is not we still get the correct result. +#if !defined(Q_OS_SOLARIS) windowContainsMouse = windowInteractsWithPosition(pos, w, ShapeInput) && windowInteractsWithPosition(pos, w, ShapeBounding); +#endif if (windowContainsMouse) return w; } -- cgit v0.12