diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-05-17 18:10:38 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-05-18 02:14:50 +0200 |
| commit | e031e12d06c77e0a05ad0c30c21f3afea94764af (patch) | |
| tree | 0ff0fc4a899b33b2fe83f7c3a2c98b6f48a2f9a9 /kcontrol/randr | |
| parent | 1389e296969df0acf7f393b698a3a0f1fb572026 (diff) | |
| download | tdebase-e031e12d06c77e0a05ad0c30c21f3afea94764af.tar.gz tdebase-e031e12d06c77e0a05ad0c30c21f3afea94764af.zip | |
Respect build option WITH_TDEHWLIB, otherwise it can lead to FTBFS in special cases.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kcontrol/randr')
| -rw-r--r-- | kcontrol/randr/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | kcontrol/randr/tderandrtray.cpp | 8 | ||||
| -rw-r--r-- | kcontrol/randr/tderandrtray.h | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/kcontrol/randr/CMakeLists.txt b/kcontrol/randr/CMakeLists.txt index cedfb8f09..1101f1ee1 100644 --- a/kcontrol/randr/CMakeLists.txt +++ b/kcontrol/randr/CMakeLists.txt @@ -11,6 +11,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index a443c3781..647f0eca7 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <tqtimer.h> #include <tqimage.h> #include <tqtooltip.h> @@ -92,7 +96,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) applyIccConfiguration(cur_profile, NULL); } -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); #endif @@ -888,7 +892,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter) } void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB if (device->type() == TDEGenericDeviceType::Monitor) { KRandrPassivePopup::message( i18n("New display output options are available!"), diff --git a/kcontrol/randr/tderandrtray.h b/kcontrol/randr/tderandrtray.h index 334e1ef31..ef6fd7bd0 100644 --- a/kcontrol/randr/tderandrtray.h +++ b/kcontrol/randr/tderandrtray.h @@ -24,7 +24,7 @@ #include <ksystemtray.h> #include <kglobalaccel.h> -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include <tdehardwaredevices.h> #else #define TDEGenericDevice void |