From a6bcd52059cbf2ae8ca516f27b3dc6f46a440a63 Mon Sep 17 00:00:00 2001 From: Jon Severinsson Date: Sat, 6 Oct 2012 22:27:43 +0200 Subject: [PATCH] plasma: QPixmap platform integration has changed in Qt5, disable it for now. This essentially makes WindowShadows a no-op, but it is better than not compiling... REVIEW: 106989 --- private/windowshadows.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/private/windowshadows.cpp b/private/windowshadows.cpp index 645dddd3e..931ad9582 100644 --- a/private/windowshadows.cpp +++ b/private/windowshadows.cpp @@ -23,6 +23,12 @@ #include +#if HAVE_X11 && QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#pragma message("X11 Pixmap code disabled, X11 <=> Qt pixmap conversion code not available in Qt 5.0") +#undef HAVE_X11 +#define HAVE_X11 0 +#endif + #if HAVE_X11 #include #include