From 225ddaa3667808031fe65763d7f533437484486c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz> Date: Mon, 17 May 2021 18:10:38 +0200 Subject: Respect build option WITH_TDEHWLIB, otherwise it can lead to FTBFS in special cases. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit e031e12d06c77e0a05ad0c30c21f3afea94764af) --- tdm/kfrontend/kgapp.cpp | 6 +++--- tdm/kfrontend/kgapp.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tdm') diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index 3fefc00bc..9e6fccfdd 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -122,14 +122,14 @@ void GreeterApp::init() startTimer( pingInterval * 60000 ); } -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); #endif } void GreeterApp::deviceChanged(TDEGenericDevice* device) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #ifdef WITH_XRANDR if (device->type() == TDEGenericDeviceType::Monitor) { KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI(); @@ -137,7 +137,7 @@ void GreeterApp::deviceChanged(TDEGenericDevice* device) { delete randrsimple; } #endif // WITH_XRANDR -#endif // __TDE_HAVE_TDEHWLIB +#endif // WITH_TDEHWLIB } void diff --git a/tdm/kfrontend/kgapp.h b/tdm/kfrontend/kgapp.h index c9e2802c1..4b6c65f6a 100644 --- a/tdm/kfrontend/kgapp.h +++ b/tdm/kfrontend/kgapp.h @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define KGAPP_H #include <tdeapplication.h> -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include <tdehardwaredevices.h> #else #define TDEGenericDevice void -- cgit v1.2.1