Port from ECMQueryQmake to ECMQueryQt

Continuation of commit 4e47b053c9d799.

All unittests still pass.

5 files changed, 21 insertions, 21 deletions

diff --git a/find-modules/FindQtWaylandScanner.cmake b/find-modules/FindQtWaylandScanner.cmake
index 71fb6307..ffe53b22 100644
--- a/find-modules/FindQtWaylandScanner.cmake
+++ b/find-modules/FindQtWaylandScanner.cmake
@@ -64,11 +64,11 @@ Since 1.4.0.
 #]=======================================================================]
 
 include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake)
-include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
 
 ecm_find_package_version_check(QtWaylandScanner)
 
-query_qmake(qt_binaries_dir QT_HOST_BINS)
+ecm_query_qt(qt_binaries_dir QT_HOST_BINS)
 
 # Find qtwaylandscanner
 find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS ${qt_binaries_dir})
diff --git a/kde-modules/KDEInstallDirs5.cmake b/kde-modules/KDEInstallDirs5.cmake
index a7e12b79..03411965 100644
--- a/kde-modules/KDEInstallDirs5.cmake
+++ b/kde-modules/KDEInstallDirs5.cmake
@@ -231,11 +231,11 @@ if(NOT KDE_INSTALL_DIRS_NO_DEPRECATED)
     set(KF5_LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_LIBEXECDIR_KF5}")
 endif()
 
-include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
 
 set(_default_KDE_INSTALL_USE_QT_SYS_PATHS OFF)
 if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS)
-    query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
+    ecm_query_qt(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
     if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
         message(STATUS "Installing in the same prefix as Qt, adopting their path scheme.")
         set(_default_KDE_INSTALL_USE_QT_SYS_PATHS ON)
@@ -245,8 +245,8 @@ endif()
 option (KDE_INSTALL_USE_QT_SYS_PATHS "Install mkspecs files, QCH files for Qt-based libs, Plugins and Imports to the Qt 5 install dir" "${_default_KDE_INSTALL_USE_QT_SYS_PATHS}")
 if(KDE_INSTALL_USE_QT_SYS_PATHS)
     # Qt-specific vars
-    query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
-    query_qmake(qt_plugins_dir QT_INSTALL_PLUGINS)
+    ecm_query_qt(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
+    ecm_query_qt(qt_plugins_dir QT_INSTALL_PLUGINS)
 
     if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
         file(RELATIVE_PATH qt_plugins_dir ${qt_install_prefix_dir} ${qt_plugins_dir})
@@ -255,7 +255,7 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
         "Qt plugins"
          QT_PLUGIN_INSTALL_DIR)
 
-    query_qmake(qt_imports_dir QT_INSTALL_IMPORTS)
+    ecm_query_qt(qt_imports_dir QT_INSTALL_IMPORTS)
 
     if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
         file(RELATIVE_PATH qt_imports_dir ${qt_install_prefix_dir} ${qt_imports_dir})
@@ -264,7 +264,7 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
         "QtQuick1 imports"
         IMPORTS_INSTALL_DIR)
 
-    query_qmake(qt_qml_dir QT_INSTALL_QML)
+    ecm_query_qt(qt_qml_dir QT_INSTALL_QML)
 
     if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
         file(RELATIVE_PATH qt_qml_dir ${qt_install_prefix_dir} ${qt_qml_dir})
@@ -308,7 +308,7 @@ endif()
 
 # Qt-specific data vars
 if(KDE_INSTALL_USE_QT_SYS_PATHS)
-    query_qmake(qt_docs_dir QT_INSTALL_DOCS)
+    ecm_query_qt(qt_docs_dir QT_INSTALL_DOCS)
 
     _define_absolute(QTQCHDIR ${qt_docs_dir}
         "documentation bundles in QCH format for Qt-extending libraries")
diff --git a/modules/ECMAddQch.cmake b/modules/ECMAddQch.cmake
index f494c543..bd8116a6 100644
--- a/modules/ECMAddQch.cmake
+++ b/modules/ECMAddQch.cmake
@@ -258,7 +258,7 @@ Since 5.36.0.
 
 include(CMakeParseArguments)
 include(${CMAKE_CURRENT_LIST_DIR}/../modules/QtVersionOption.cmake)
-include(ECMQueryQmake)
+include(ECMQueryQt)
 
 
 # Helper method: adding the LINK_QCHS property to a Qt QCH targets, from module base names ("Core" etc.)
@@ -282,7 +282,7 @@ function(_ecm_ensure_qt_qch_targets)
         # get Qt version, if any
         find_package(Qt${QT_MAJOR_VERSION}Core CONFIG QUIET)
         # lookup tag files
-        query_qmake(qt_docs_dir QT_INSTALL_DOCS TRY)
+        ecm_query_qt(qt_docs_dir QT_INSTALL_DOCS TRY)
         find_path(_qtcoreTagsPath qtcore/qtcore.tags
             PATHS
                 ${qt_docs_dir}
diff --git a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in
index 6c054bf0..0ee5665e 100644
--- a/modules/ECMFindQmlModule.cmake.in
+++ b/modules/ECMFindQmlModule.cmake.in
@@ -8,8 +8,8 @@ include(FindPackageHandleStandardArgs)
 include("${ECM_MODULE_DIR}/QtVersionOption.cmake")
 
 if (QT_MAJOR_VERSION EQUAL "5")
-    include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
-    query_qmake(qt_binaries_dir QT_HOST_BINS)
+    include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
+    ecm_query_qt(qt_binaries_dir QT_HOST_BINS)
     find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
 elseif (QT_MAJOR_VERSION EQUAL "6")
     find_package(Qt6 COMPONENTS QmlTools REQUIRED)
diff --git a/modules/ECMGeneratePriFile.cmake b/modules/ECMGeneratePriFile.cmake
index 295656ca..9fdf713a 100644
--- a/modules/ECMGeneratePriFile.cmake
+++ b/modules/ECMGeneratePriFile.cmake
@@ -89,19 +89,19 @@ Since pre-1.0.0.
 
 # Replicate the logic from KDEInstallDirs.cmake as we can't depend on it
 # Ask qmake if we're using the same prefix as Qt
-set(_askqmake OFF)
+set(_should_query_qt OFF)
 if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS)
-    include(ECMQueryQmake)
-    query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
+    include(ECMQueryQt)
+    ecm_query_qt(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
     if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
-        set(_askqmake ON)
+        set(_should_query_qt ON)
     endif()
 endif()
 
-if(KDE_INSTALL_USE_QT_SYS_PATHS OR _askqmake)
-  include(ECMQueryQmake)
-  query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX)
-  query_qmake(qt_host_data_dir QT_HOST_DATA)
+if(KDE_INSTALL_USE_QT_SYS_PATHS OR _should_query_qt)
+  include(ECMQueryQt)
+  ecm_query_qt(qt_install_prefix_dir QT_INSTALL_PREFIX)
+  ecm_query_qt(qt_host_data_dir QT_HOST_DATA)
   if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
     file(RELATIVE_PATH qt_host_data_dir ${qt_install_prefix_dir} ${qt_host_data_dir})
   endif()