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/displayconfig | |
| 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/displayconfig')
| -rw-r--r-- | kcontrol/displayconfig/displayconfig.cpp | 8 | ||||
| -rw-r--r-- | kcontrol/displayconfig/displayconfig.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index 8311b428e..4408e2c74 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <tqcheckbox.h> #include <tqlabel.h> #include <tqlayout.h> @@ -744,7 +748,7 @@ void KDisplayConfig::setRealResolutionSliderValue(int index) { KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStringList &) : TDECModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); #endif @@ -863,7 +867,7 @@ KDisplayConfig::~KDisplayConfig() } void KDisplayConfig::deviceChanged (TDEGenericDevice* device) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB if (device->type() == TDEGenericDeviceType::Monitor) { if (base->rescanHardware->isEnabled()) { base->rescanHardware->setEnabled(false); diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h index dce061003..6b4faea70 100644 --- a/kcontrol/displayconfig/displayconfig.h +++ b/kcontrol/displayconfig/displayconfig.h @@ -21,10 +21,6 @@ #ifndef _KCM_DisplayCONFIG_H #define _KCM_DisplayCONFIG_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include <tqptrlist.h> #include <tqslider.h> #include <tqworkspace.h> @@ -35,7 +31,7 @@ #include <dcopobject.h> #include <libtderandr/libtderandr.h> -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include <tdehardwaredevices.h> #else #define TDEGenericDevice void |