replace X11-specific code with generic

svn path=/trunk/KDE/kdebase/apps/; revision=1093243

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1fc017a45db5c04d5d6774d3c94583798d84f469..264fc6ec19fcba2766d1b75bde4f1ebb9bb10bc8 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -76,10 +76,7 @@ kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
 
 kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS})
 
-target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${KDE4_KNEWSTUFF3_LIBS} ${QIMAGEBLITZ_LIBRARIES} ${X11_LIBRARIES})
-if(X11_Xrender_FOUND)
-  target_link_libraries(dolphinprivate ${X11_Xrender_LIB} )
-endif(X11_Xrender_FOUND)
+target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${KDE4_KNEWSTUFF3_LIBS} ${QIMAGEBLITZ_LIBRARIES})
 if (Nepomuk_FOUND)
   target_link_libraries(dolphinprivate ${NEPOMUK_LIBRARIES} ${NEPOMUK_QUERY_LIBRARIES} ${SOPRANO_LIBRARIES})
 endif (Nepomuk_FOUND)

diff --git a/src/tooltips/ktooltipwindow.cpp b/src/tooltips/ktooltipwindow.cpp
index a90973fb8c11c67a4f3f867726ab29fa0d2e0685..035e141eba8b023e12afcd82ac1ddd1fa12c1ff1 100644 (file)
--- a/src/tooltips/ktooltipwindow.cpp
+++ b/src/tooltips/ktooltipwindow.cpp
@@ -22,14 +22,11 @@
 #include "ktooltipwindow_p.h"
 
 #include <kcolorscheme.h>
+#include <kwindowsystem.h>
 
 #include <QPainter>
 #include <QVBoxLayout>
 
-#ifdef Q_WS_X11
-    #include <QX11Info>
-#endif
-
 KToolTipWindow::KToolTipWindow(QWidget* content) :
     QWidget(0)
 {
@@ -53,11 +50,7 @@ void KToolTipWindow::paintEvent(QPaintEvent* event)
     QColor toColor = palette().brush(QPalette::ToolTipBase).color();
     QColor fromColor = KColorScheme::shade(toColor, KColorScheme::LightShade, 0.2);
 
-#ifdef Q_WS_X11
-    const bool haveAlphaChannel = QX11Info::isCompositingManagerRunning();
-#else
-    const bool haveAlphaChannel = false;
-#endif
+    const bool haveAlphaChannel = KWindowSystem::compositingActive();
     if (haveAlphaChannel) {
         painter.setRenderHint(QPainter::Antialiasing);
         painter.translate(0.5, 0.5);