diff options
| author | Luboš Luňák <[email protected]> | 2010-02-20 11:52:46 +0000 |
|---|---|---|
| committer | Luboš Luňák <[email protected]> | 2010-02-20 11:52:46 +0000 |
| commit | a2f0d69558cd933086636baee68cb2918e27743f (patch) | |
| tree | 27a9ddd7de7b1ae68091bf0078c33cae28fe75e1 | |
| parent | 52e1503052508d6423d4deba05ea93a075ad78fe (diff) | |
replace X11-specific code with generic
svn path=/trunk/KDE/kdebase/apps/; revision=1093243
| -rw-r--r-- | src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/tooltips/ktooltipwindow.cpp | 11 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1fc017a45..264fc6ec1 100644 --- 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 a90973fb8..035e141eb 100644 --- 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); |