Fix Qt5 plugin build with current ECM

platformtheme/CMakeLists.txt

@@ -14,6 +14,7 @@ find_package(Qt5Gui CONFIG REQUIRED Private)
 find_package(Qt5XdgIconLoader REQUIRED)
 find_package(dbusmenu-qt5 REQUIRED)
 find_package(KF5WindowSystem REQUIRED)
+find_package(PkgConfig REQUIRED)
 
 # dependencies for QPA plugin
 find_package(Qt5ThemeSupport REQUIRED)
@@ -22,7 +23,8 @@ set(QT5PLATFORMSUPPORT_LIBS Qt5ThemeSupport::Qt5ThemeSupport)
 # qdbusmenubar uses them
 remove_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS)
 
-pkg_check_modules(XCB_EWMH REQUIRED xcb xcb-ewmh x11)
+# xcb-ewmh was never used by this plugin and is no longer pulled in by Qt.
+pkg_check_modules(XCB REQUIRED IMPORTED_TARGET xcb x11)
 
 set (SRCS
     main.cpp
@@ -70,20 +72,13 @@ target_link_libraries(cutefishplatformtheme PRIVATE
     Qt5XdgIconLoader
 
     KF5::WindowSystem
-    ${XCB_LIBRARIES}
+    PkgConfig::XCB
     ${QT5PLATFORMSUPPORT_LIBS}
 )
 
-get_target_property(QT_QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE} IMPORTED_LOCATION)
+find_program(QT_QMAKE_EXECUTABLE NAMES qmake-qt5 qmake REQUIRED)
-if(NOT QT_QMAKE_EXECUTABLE)
+execute_process(COMMAND "${QT_QMAKE_EXECUTABLE}" -query QT_INSTALL_PLUGINS
-    message(FATAL_ERROR "qmake is not found.")
+    OUTPUT_VARIABLE QT_PLUGINS_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif()
-
-# execute the command "qmake -query QT_INSTALL_PLUGINS" to get the path of plugins dir.
-execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_PLUGINS
-    OUTPUT_VARIABLE QT_PLUGINS_DIR
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
 if(QT_PLUGINS_DIR)
     message(STATUS "Qt5 plugin directory:" "${QT_PLUGINS_DIR}")
 else()

widgetstyle/CMakeLists.txt

@@ -14,8 +14,6 @@ find_package(Qt5 REQUIRED ${QT})
 find_package(PkgConfig REQUIRED)
 find_package(KF5 REQUIRED WindowSystem)
 
-include(ECMQueryQmake)
-
 set (SRCS
     blurhelper.cpp
     blurhelper.h
@@ -44,6 +42,8 @@ target_link_libraries(${TARGET}
     KF5::WindowSystem
     )
 
-query_qmake(CMAKE_INSTALL_QTPLUGINDIR QT_INSTALL_PLUGINS)
+find_program(QT_QMAKE_EXECUTABLE NAMES qmake-qt5 qmake REQUIRED)
+execute_process(COMMAND "${QT_QMAKE_EXECUTABLE}" -query QT_INSTALL_PLUGINS
+    OUTPUT_VARIABLE CMAKE_INSTALL_QTPLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_QTPLUGINDIR}/styles/)