diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2014-10-18 14:19:37 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2014-10-18 14:29:21 +0200 |
commit | 107220694fe3387df4051dcd94ae6c9995cb45f6 (patch) | |
tree | 4301e933aa91df778cdc97153f4e1bd4ba4e3114 /kcontrol/displayconfig | |
parent | 69da674b30d246f4df152501b9312518cd900372 (diff) | |
download | tdebase-107220694fe3387df4051dcd94ae6c9995cb45f6.tar.gz tdebase-107220694fe3387df4051dcd94ae6c9995cb45f6.zip |
Allow contitional build with tdehwlib
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kcontrol/displayconfig')
-rw-r--r-- | kcontrol/displayconfig/displayconfig.cpp | 4 | ||||
-rw-r--r-- | kcontrol/displayconfig/displayconfig.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index db371fc42..d326740b7 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -742,8 +742,10 @@ void KDisplayConfig::setRealResolutionSliderValue(int index) { KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStringList &) : TDECModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0) { +#ifdef __TDE_HAVE_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); +#endif m_randrsimple = new KRandrSimpleAPI(); @@ -859,6 +861,7 @@ KDisplayConfig::~KDisplayConfig() } void KDisplayConfig::deviceChanged (TDEGenericDevice* device) { +#ifdef __TDE_HAVE_TDEHWLIB if (device->type() == TDEGenericDeviceType::Monitor) { if (base->rescanHardware->isEnabled()) { base->rescanHardware->setEnabled(false); @@ -866,6 +869,7 @@ void KDisplayConfig::deviceChanged (TDEGenericDevice* device) { base->rescanHardware->setEnabled(true); } } +#endif } void KDisplayConfig::updateExtendedMonitorInformation () { diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h index a52ebb3fc..92fa1f421 100644 --- a/kcontrol/displayconfig/displayconfig.h +++ b/kcontrol/displayconfig/displayconfig.h @@ -35,7 +35,11 @@ #include <dcopobject.h> #include <libtderandr/libtderandr.h> +#ifdef __TDE_HAVE_TDEHWLIB #include <tdehardwaredevices.h> +#else +#define TDEGenericDevice void +#endif #include "monitorworkspace.h" #include "displayconfigbase.h" |