diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-04-30 13:44:47 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-03 20:49:37 (GMT) |
| commit | 00ac402870730592965a41567bb4d577fc441f82 (patch) | |
| tree | b09e76547d6a53dd0c716352f5cb4242e98fe745 /src | |
| parent | a03c9f329e86cace6557fc68dac8b89a15993ee4 (diff) | |
| download | Qt-00ac402870730592965a41567bb4d577fc441f82.zip Qt-00ac402870730592965a41567bb4d577fc441f82.tar.gz Qt-00ac402870730592965a41567bb4d577fc441f82.tar.bz2 | |
Fix compilation error on old Unix systems caused by ShapeInput
Change 33bb996c83e541c26df632b3e8883a1190cc97f0 caused a build error
on Solaris/HP-UX (at least) as ShapeInput type is not present in
default system headers.
Change-Id: I6e19351651856ed71bc9ceaeae625ceac74b27b0
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qdnd_x11.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp index 4a98419..b312d7e 100644 --- a/src/gui/kernel/qdnd_x11.cpp +++ b/src/gui/kernel/qdnd_x11.cpp @@ -1465,8 +1465,10 @@ 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) +#if defined(ShapeInput) && defined(ShapeBounding) windowContainsMouse = windowInteractsWithPosition(pos, w, ShapeInput) && windowInteractsWithPosition(pos, w, ShapeBounding); +#elif defined(ShapeBounding) + windowContainsMouse = windowInteractsWithPosition(pos, w, ShapeBounding); #endif if (windowContainsMouse) return w; |