summaryrefslogtreecommitdiffstats
path: root/tdm
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-05-17 18:10:38 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-05-18 14:07:41 +0200
commit225ddaa3667808031fe65763d7f533437484486c (patch)
treee9d7f1883f85f355d8772c5d918d3efa578a76c5 /tdm
parent9bdd3a0e4724a591f0cdc6dd8bdd60dc794354e4 (diff)
downloadtdebase-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 <slavek.banko@axis.cz> (cherry picked from commit e031e12d06c77e0a05ad0c30c21f3afea94764af)
Diffstat (limited to 'tdm')
-rw-r--r--tdm/kfrontend/kgapp.cpp6
-rw-r--r--tdm/kfrontend/kgapp.h2
2 files changed, 4 insertions, 4 deletions
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