From kde-commits  Mon Dec 24 16:03:29 2012
From: Till Adam <till () kdab ! com>
Date: Mon, 24 Dec 2012 16:03:29 +0000
To: kde-commits
Subject: [kdelibs/KDE/4.10] /: Fix the non-x11 build.
Message-Id: <20121224160329.CAC0CA6091 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=135636501825336

Git commit 157a06e46f46ba83ba37a93b400647f4886e18c9 by Till Adam.
Committed on 24/12/2012 at 17:01.
Pushed by tilladam into branch 'KDE/4.10'.

Fix the non-x11 build.

M  +1    -1    kdeui/tests/CMakeLists.txt
M  +4    -0    plasma/private/dialogshadows.cpp

http://commits.kde.org/kdelibs/157a06e46f46ba83ba37a93b400647f4886e18c9

diff --git a/kdeui/tests/CMakeLists.txt b/kdeui/tests/CMakeLists.txt
index 703d061..85f12ed 100644
--- a/kdeui/tests/CMakeLists.txt
+++ b/kdeui/tests/CMakeLists.txt
@@ -149,7 +149,6 @@ KDEUI_EXECUTABLE_TESTS(
   kxmlguiwindowtest
   testqtargs
   kpixmapsequenceoverlaypaintertest
-  kmanagerselectiontest
 )
 =

 if (NOT KDE_NO_DEPRECATED)
@@ -164,6 +163,7 @@ KDEUI_EXECUTABLE_TESTS(
  fixx11h_test
  fixx11h_test2
  kxerrorhandlertest
+ kmanagerselectiontest
 )
 target_link_libraries(kmanagerselectiontest ${X11_X11_LIB})
 target_link_libraries(kxerrorhandlertest ${X11_X11_LIB})
diff --git a/plasma/private/dialogshadows.cpp b/plasma/private/dialogshadow=
s.cpp
index eb4f5c9..481f7bd 100644
--- a/plasma/private/dialogshadows.cpp
+++ b/plasma/private/dialogshadows.cpp
@@ -161,10 +161,14 @@ void DialogShadows::Private::initPixmap(const QString=
 &element)
 =

 QPixmap DialogShadows::Private::initEmptyPixmap(const QSize &size)
 {
+#ifdef Q_WS_X11
     Pixmap emptyXPix =3D XCreatePixmap(QX11Info::display(), QX11Info::appR=
ootWindow(), size.width(), size.height(), 32);
     QPixmap tempEmptyPix =3D QPixmap::fromX11Pixmap(emptyXPix, QPixmap::Ex=
plicitlyShared);
     tempEmptyPix.fill(Qt::transparent);
     return tempEmptyPix;
+#else
+    return QPixmap();
+#endif
 }
 =

 void DialogShadows::Private::setupPixmaps()