From fd707ac5bb1b43ed40c0ce644e511035701f9bc5 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Fri, 11 Oct 2024 22:38:52 +0900
Subject: [PATCH] Use tquic directly instead of relying on tqtinterface info

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 modules/FindTQt.cmake   | 24 +++++++-----------------
 modules/TDEMacros.cmake |  2 +-
 modules/tde_uic.cmake   |  4 ++--
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/modules/FindTQt.cmake b/modules/FindTQt.cmake
index 1c640fc..8f75c8b 100644
--- a/modules/FindTQt.cmake
+++ b/modules/FindTQt.cmake
@@ -20,30 +20,20 @@ if( NOT TQT_FOUND )
     tde_message_fatal( "Unable to find tqt!\n Try adding the directory in which the tqt.pc file is located\nto the PKG_CONFIG_PATH variable." )
   endif( )
 
-  mark_as_advanced(
-    UIC_EXECUTABLE
-  )
-
-  # tqmoc_executable
+  # tqmoc executable
   pkg_get_variable( TQT_PREFIX tqt-mt prefix )
   find_program( TQMOC_EXECUTABLE NAMES tqmoc HINTS "${TQT_PREFIX}/bin" )
   if( NOT TQMOC_EXECUTABLE )
-    tde_message_fatal( "tqmoc was NOT found.\n Please make sure TQt is correctly installed." )
+    tde_message_fatal( "tqmoc was not found.\n Please make sure TQt is correctly installed." )
   endif( )
   tqt_message( "  tqmoc path: ${TQMOC_EXECUTABLE}" )
 
-  # uic_executable
-  tde_execute_process(
-    COMMAND pkg-config tqt --variable=uic_executable
-    OUTPUT_VARIABLE UIC_EXECUTABLE
-    CACHE FILEPATH "TQt uic executable path"
-    OUTPUT_STRIP_TRAILING_WHITESPACE )
-
-  if( NOT EXISTS ${UIC_EXECUTABLE} )
-    tde_message_fatal( "uic not found!\n tqt is correctly installed?" )
+  # tquic executable
+  find_program( TQUIC_EXECUTABLE NAMES tquic HINTS "${TQT_PREFIX}/bin" )
+  if( NOT EXISTS ${TQUIC_EXECUTABLE} )
+    tde_message_fatal( "tquic was not found.\n Please make sure TQt is correctly installed." )
   endif( )
-
-  tqt_message( "  uic path: ${UIC_EXECUTABLE}" )
+  tqt_message( "  tquic path: ${TQUIC_EXECUTABLE}" )
 
 
   # check if tqt is usable
diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake
index 71b73e9..0fa67ef 100644
--- a/modules/TDEMacros.cmake
+++ b/modules/TDEMacros.cmake
@@ -486,7 +486,7 @@ macro( tde_add_ui_files _sources )
 
     add_custom_command( OUTPUT ${_ui_basename}.h ${_ui_basename}.cpp
       COMMAND ${CMAKE_COMMAND}
-        -DUIC_EXECUTABLE:FILEPATH=${UIC_EXECUTABLE}
+        -DTQUIC_EXECUTABLE:FILEPATH=${TQUIC_EXECUTABLE}
         -DTQT_REPLACE_SCRIPT:FILEPATH=${TQT_REPLACE_SCRIPT}
         -DTDE_TQTPLUGINS_DIR:FILEPATH=${TDE_TQTPLUGINS_DIR}
         -DTQMOC_EXECUTABLE:FILEPATH=${TQMOC_EXECUTABLE}
diff --git a/modules/tde_uic.cmake b/modules/tde_uic.cmake
index 4a38eaa..c573d5a 100644
--- a/modules/tde_uic.cmake
+++ b/modules/tde_uic.cmake
@@ -37,7 +37,7 @@ else( TDE_FOUND AND NOT TQT_ONLY )
 endif( TDE_FOUND AND NOT TQT_ONLY )
 
 # Generate ui .h file
-tde_execute_process( COMMAND ${UIC_EXECUTABLE}
+tde_execute_process( COMMAND ${TQUIC_EXECUTABLE}
   -nounload -tr ${TR_FUNC}
   ${L}
   ${local_ui_file}
@@ -54,7 +54,7 @@ if( _ui_h_content )
 endif( )
 
 # Generate ui .cpp file
-tde_execute_process( COMMAND ${UIC_EXECUTABLE}
+tde_execute_process( COMMAND ${TQUIC_EXECUTABLE}
   -nounload -tr ${TR_FUNC}
   ${L}
   -impl ${_ui_basename}.h