diff options
| author | Slávek Banko <[email protected]> | 2021-05-17 18:10:38 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2021-05-18 14:07:41 +0200 |
| commit | 225ddaa3667808031fe65763d7f533437484486c (patch) | |
| tree | e9d7f1883f85f355d8772c5d918d3efa578a76c5 /kcontrol/randr | |
| parent | 9bdd3a0e4724a591f0cdc6dd8bdd60dc794354e4 (diff) | |
| download | tdebase-225ddaa3667808031fe65763d7f533437484486c.tar.gz tdebase-225ddaa3667808031fe65763d7f533437484486c.zip | |
Respect build option WITH_TDEHWLIB, otherwise it can lead to FTBFS in special cases.
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit e031e12d06c77e0a05ad0c30c21f3afea94764af)
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 25a3a897e..89c530523 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 8f382922f..54b35bdda 100644 --- a/kcontrol/randr/tderandrtray.h +++ b/kcontrol/randr/tderandrtray.h @@ -25,7 +25,7 @@ #include <kglobalaccel.h> #include <libtderandr/libtderandr.h> -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include <tdehardwaredevices.h> #else #define TDEGenericDevice void |