diff --git a/CMakeLists.txt b/CMakeLists.txt index 70a3ff73f9..7658934182 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -293,7 +293,6 @@ set_package_properties(hwdata PROPERTIES PURPOSE "Runtime-only dependency needed for mapping monitor hardware vendor IDs to full names" URL "https://github.com/vcrhonek/hwdata" ) -set(HAVE_HWDATA ${hwdata_FOUND}) include(ECMQMLModules) ecm_find_qmlmodule(QtQuick 2.3) diff --git a/cmake/modules/Findhwdata.cmake b/cmake/modules/Findhwdata.cmake index 005edac43e..e5f7ac9987 100644 --- a/cmake/modules/Findhwdata.cmake +++ b/cmake/modules/Findhwdata.cmake @@ -34,7 +34,7 @@ if (UNIX AND NOT APPLE) find_path(hwdata_DIR NAMES hwdata/pnp.ids HINTS /usr/share ENV XDG_DATA_DIRS) find_file(hwdata_PNPIDS_FILE NAMES hwdata/pnp.ids HINTS /usr/share) - if (hwdata_DIR-NOTFOUND OR hwdata_PNPIDS_FILE-NOTFOUND) + if (NOT hwdata_DIR OR NOT hwdata_PNPIDS_FILE) set(hwdata_FOUND FALSE) else() set(hwdata_FOUND TRUE) diff --git a/config-kwin.h.cmake b/config-kwin.h.cmake index 4ab037e2a8..90efb3e58f 100644 --- a/config-kwin.h.cmake +++ b/config-kwin.h.cmake @@ -25,7 +25,6 @@ #cmakedefine01 HAVE_BREEZE_DECO #cmakedefine01 HAVE_LIBCAP #cmakedefine01 HAVE_SCHED_RESET_ON_FORK -#cmakedefine01 HAVE_HWDATA #if HAVE_BREEZE_DECO #define BREEZE_KDECORATION_PLUGIN_ID "${BREEZE_KDECORATION_PLUGIN_ID}" #endif @@ -42,7 +41,3 @@ #define XCB_ICCCM_WM_STATE_NORMAL 1 #define XCB_ICCCM_WM_STATE_ICONIC 3 #endif - -#if HAVE_HWDATA -#cmakedefine HWDATA_PNPIDS_FILE "@hwdata_PNPIDS_FILE@" -#endif diff --git a/plugins/platforms/drm/edid.cpp b/plugins/platforms/drm/edid.cpp index 1081ab409f..b8e88436c5 100644 --- a/plugins/platforms/drm/edid.cpp +++ b/plugins/platforms/drm/edid.cpp @@ -23,6 +23,7 @@ along with this program. If not, see . #include "config-kwin.h" #include +#include namespace KWin { @@ -142,11 +143,10 @@ static QByteArray parseSerialNumber(const uint8_t *data) static QByteArray parseVendor(const uint8_t *data) { -#if HAVE_HWDATA const auto pnpId = parsePnpId(data); // Map to vendor name - QFile pnpFile(QStringLiteral(HWDATA_PNPIDS_FILE)); + QFile pnpFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("hwdata/pnp.ids"))); if (pnpFile.exists() && pnpFile.open(QIODevice::ReadOnly)) { while (!pnpFile.atEnd()) { const auto line = pnpFile.readLine(); @@ -155,9 +155,7 @@ static QByteArray parseVendor(const uint8_t *data) } } } -#else - Q_UNUSED(data) -#endif + return {}; }