diff options
| author | Timothy Pearson <[email protected]> | 2014-10-18 18:35:56 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2014-10-18 18:35:56 -0500 |
| commit | 891da4b83e901780ca4becb9b6f7c9cf0fb70ffd (patch) | |
| tree | b177b8ddddf3a0e73a86e482d88e0e188c601516 /kcontrol/randr | |
| parent | 0c11ace605ba33feb137eca638a39c27a71e1d8d (diff) | |
| parent | d7ccc16037550f5dc9ba2db00e47ea950c3732d2 (diff) | |
| download | tdebase-891da4b83e901780ca4becb9b6f7c9cf0fb70ffd.tar.gz tdebase-891da4b83e901780ca4becb9b6f7c9cf0fb70ffd.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kcontrol/randr')
| -rw-r--r-- | kcontrol/randr/tderandrtray.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/randr/tderandrtray.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index d6a711db7..a443c3781 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -92,8 +92,10 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) applyIccConfiguration(cur_profile, NULL); } +#ifdef __TDE_HAVE_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); +#endif } /*! @@ -886,6 +888,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter) } void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) { +#ifdef __TDE_HAVE_TDEHWLIB if (device->type() == TDEGenericDeviceType::Monitor) { KRandrPassivePopup::message( i18n("New display output options are available!"), @@ -895,6 +898,7 @@ void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) { reloadDisplayConfiguration(); applyHotplugRules(locateLocal("config", "/", true)); } +#endif } void KRandRSystemTray::slotHelpContents() diff --git a/kcontrol/randr/tderandrtray.h b/kcontrol/randr/tderandrtray.h index 09a1b2671..8f382922f 100644 --- a/kcontrol/randr/tderandrtray.h +++ b/kcontrol/randr/tderandrtray.h @@ -25,7 +25,11 @@ #include <kglobalaccel.h> #include <libtderandr/libtderandr.h> +#ifdef __TDE_HAVE_TDEHWLIB #include <tdehardwaredevices.h> +#else +#define TDEGenericDevice void +#endif class KHelpMenu; class TDEPopupMenu; |