Index: solid/solid/CMakeLists.txt =================================================================== --- solid/solid/CMakeLists.txt (revision 1198779) +++ solid/solid/CMakeLists.txt (working copy) @@ -185,32 +185,32 @@ endif( UDEV_FOUND ) - message(STATUS "Building Solid HAL backend." ) - set(solid_LIB_SRCS ${solid_LIB_SRCS} - backends/hal/halacadapter.cpp - backends/hal/halaudiointerface.cpp - backends/hal/halbattery.cpp - backends/hal/halblock.cpp - backends/hal/halbutton.cpp - backends/hal/halcamera.cpp - backends/hal/halcdrom.cpp - backends/hal/haldeviceinterface.cpp - backends/hal/haldvbinterface.cpp - backends/hal/halfstabhandling.cpp - backends/hal/halgenericinterface.cpp - backends/hal/haldevice.cpp - backends/hal/halmanager.cpp - backends/hal/halnetworkinterface.cpp - backends/hal/halserialinterface.cpp - backends/hal/halopticaldisc.cpp - backends/hal/halportablemediaplayer.cpp - backends/hal/halprocessor.cpp - backends/hal/halstorageaccess.cpp - backends/hal/halstorage.cpp - backends/hal/halvideo.cpp - backends/hal/halvolume.cpp - backends/hal/halsmartcardreader.cpp - ) +# message(STATUS "Building Solid HAL backend." ) +# set(solid_LIB_SRCS ${solid_LIB_SRCS} +# backends/hal/halacadapter.cpp +# backends/hal/halaudiointerface.cpp +# backends/hal/halbattery.cpp +# backends/hal/halblock.cpp +# backends/hal/halbutton.cpp +# backends/hal/halcamera.cpp +# backends/hal/halcdrom.cpp +# backends/hal/haldeviceinterface.cpp +# backends/hal/haldvbinterface.cpp +# backends/hal/halfstabhandling.cpp +# backends/hal/halgenericinterface.cpp +# backends/hal/haldevice.cpp +# backends/hal/halmanager.cpp +# backends/hal/halnetworkinterface.cpp +# backends/hal/halserialinterface.cpp +# backends/hal/halopticaldisc.cpp +# backends/hal/halportablemediaplayer.cpp +# backends/hal/halprocessor.cpp +# backends/hal/halstorageaccess.cpp +# backends/hal/halstorage.cpp +# backends/hal/halvideo.cpp +# backends/hal/halvolume.cpp +# backends/hal/halsmartcardreader.cpp +# ) message(STATUS "Building Solid UPower backend." ) set(solid_LIB_SRCS ${solid_LIB_SRCS} Index: solid/solid/managerbase.cpp =================================================================== --- solid/solid/managerbase.cpp (revision 1198779) +++ solid/solid/managerbase.cpp (working copy) @@ -30,7 +30,7 @@ #if defined (Q_OS_MAC) #include "backends/iokit/iokitmanager.h" #elif defined (Q_OS_UNIX) -#include "backends/hal/halmanager.h" +//#include "backends/hal/halmanager.h" #include "backends/udisks/udisksmanager.h" #include "backends/upower/upowermanager.h" @@ -71,7 +71,7 @@ # if defined (UDEV_FOUND) m_backends << new Solid::Backends::UDev::UDevManager(0); # endif - m_backends << new Solid::Backends::Hal::HalManager(0) + m_backends //<< new Solid::Backends::Hal::HalManager(0) // FIXME: the udisks backend used to build on !Linux too # if defined (Q_OS_LINUX) << new Solid::Backends::UDisks::UDisksManager(0)