>From dec0a82eb799deb6b6f8933b376c913449fc79df Mon Sep 17 00:00:00 2001 From: Andreas Stricker Date: Wed, 27 May 2009 17:28:56 +0200 Subject: [PATCH 04/14] Disabled xrandr extension for OSX in solid powermanager --- workspace/libs/solid/control/powermanager.cpp | 8 ++++++-- .../libs/solid/control/powermanager_randr.cpp | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/workspace/libs/solid/control/powermanager.cpp b/workspace/libs/solid/control/powermanager.cpp index 02b04dc..545c3ae 100644 --- a/workspace/libs/solid/control/powermanager.cpp +++ b/workspace/libs/solid/control/powermanager.cpp @@ -25,7 +25,9 @@ #include "ifaces/powermanager.h" #include #include +#ifdef Q_WS_X11 #include +#endif K_GLOBAL_STATIC(Solid::Control::PowerManagerPrivate, globalPowerManager) @@ -148,7 +150,9 @@ Solid::Control::PowerManager::BrightnessControlsList Solid::Control::PowerManage Solid::Control::PowerManager::BrightnessControlsList(), brightnessControlsAvailable()); } +#ifdef Q_WS_X11 extern float xrandr_brightlight(Display *dpy, long new_value = -1); +#endif bool Solid::Control::PowerManager::setBrightness(float brightness, const QString &device) { @@ -157,7 +161,7 @@ bool Solid::Control::PowerManager::setBrightness(float brightness, const QString Solid::Control::PowerManager::BrightnessControlsList controls = brightnessControlsAvailable(); if(controls.size() == 0) { -#ifdef Q_WS_WIN +#ifndef Q_WS_X11 return false; #else return ( xrandr_brightlight( QX11Info::display(), brightness ) >= 0 ); @@ -187,7 +191,7 @@ float Solid::Control::PowerManager::brightness(const QString &device) Solid::Control::PowerManager::BrightnessControlsList controls = brightnessControlsAvailable(); if(controls.size() == 0) { -#ifdef Q_WS_WIN +#ifndef Q_WS_X11 return false; #else return xrandr_brightlight( QX11Info::display() ); diff --git a/workspace/libs/solid/control/powermanager_randr.cpp b/workspace/libs/solid/control/powermanager_randr.cpp index bfca494..bb33199 100644 --- a/workspace/libs/solid/control/powermanager_randr.cpp +++ b/workspace/libs/solid/control/powermanager_randr.cpp @@ -36,7 +36,7 @@ float xrandr_brightlight(Display *dpy, long new_value = -1) ( void )new_value; -#if defined( HAS_RANDR_1_2 ) +#if defined( HAS_RANDR_1_2 ) && defined( Q_WS_X11 ) int major, minor; if (!XRRQueryVersion (dpy, &major, &minor)) return -1; -- 1.6.3.1