Make QtDBus dependency optional

This commit is contained in:
Christophe Dumez
2011-03-07 20:22:35 +00:00
parent 82e41f36ee
commit b6c3189fe3
11 changed files with 115 additions and 35 deletions

View File

@@ -30,7 +30,7 @@
#include <QtGlobal>
#ifdef Q_WS_X11
#if defined(Q_WS_X11) && defined(QT_DBUS_LIB)
#include "powermanagement_x11.h"
#endif
#include "powermanagement.h"
@@ -45,7 +45,7 @@
PowerManagement::PowerManagement(QObject *parent) : QObject(parent), m_busy(false)
{
#ifdef Q_WS_X11
#if defined(Q_WS_X11) && defined(QT_DBUS_LIB)
m_inhibitor = new PowerManagementInhibitor(this);
#endif
}
@@ -67,7 +67,7 @@ void PowerManagement::setBusy()
#ifdef Q_WS_WIN
SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED);
#elif defined(Q_WS_X11)
#elif defined(Q_WS_X11) && defined(QT_DBUS_LIB)
m_inhibitor->RequestBusy();
#elif defined(Q_WS_MAC)
IOReturn success = IOPMAssertionCreate(kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, &m_assertionID);
@@ -82,7 +82,7 @@ void PowerManagement::setIdle()
#ifdef Q_WS_WIN
SetThreadExecutionState(ES_CONTINUOUS);
#elif defined(Q_WS_X11)
#elif defined(Q_WS_X11) && defined(QT_DBUS_LIB)
m_inhibitor->RequestIdle();
#elif defined(Q_WS_MAC)
IOPMAssertionRelease(m_assertionID);

View File

@@ -38,32 +38,32 @@
#include <IOKit/pwr_mgt/IOPMLib.h>
#endif
#ifdef Q_WS_X11
#if defined(Q_WS_X11) && defined(QT_DBUS_LIB)
// Require DBus
class PowerManagementInhibitor;
#endif
class PowerManagement : public QObject
{
Q_OBJECT
Q_OBJECT
public:
PowerManagement(QObject *parent = 0);
virtual ~PowerManagement();
PowerManagement(QObject *parent = 0);
virtual ~PowerManagement();
void setActivityState(bool busy);
void setActivityState(bool busy);
private:
bool m_busy;
bool m_busy;
void setBusy();
void setIdle();
void setBusy();
void setIdle();
#ifdef Q_WS_X11
PowerManagementInhibitor *m_inhibitor;
#if defined(Q_WS_X11) && defined(QT_DBUS_LIB)
PowerManagementInhibitor *m_inhibitor;
#endif
#ifdef Q_WS_MAC
IOPMAssertionID m_assertionID;
IOPMAssertionID m_assertionID;
#endif
};

View File

@@ -3,7 +3,7 @@ INCLUDEPATH += $$PWD
HEADERS += $$PWD/powermanagement.h
SOURCES += $$PWD/powermanagement.cpp
unix:!macx {
HEADERS += $$PWD/powermanagement_x11.h
SOURCES += $$PWD/powermanagement_x11.cpp
unix:!macx:dbus {
HEADERS += $$PWD/powermanagement_x11.h
SOURCES += $$PWD/powermanagement_x11.cpp
}