From e591f141171b3e7816dba29278ea15d43c378d9a Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Fri, 26 Feb 2021 15:54:45 +0100
Subject: [PATCH] Move syncqt.pl to libexec

To not disturb the qmake build we kept syncqt.pl in <src>/bin but
installed it to libexec. This is not necessary anymore.

This also removes the need for having syncqt.pl in both, bin and libexec
in the build dir of qtbase.

Fixes: QTBUG-91076
Change-Id: I44b014ea41e3f00c420e02fd5c76f11169340b8c
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit 800f7451406d58910568854deb4dbebbca0ee6d4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 cmake/QtSyncQtHelpers.cmake            | 6 +-----
 {bin => libexec}/syncqt.pl             | 0
 mkspecs/features/qt_module_headers.prf | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)
 rename {bin => libexec}/syncqt.pl (100%)

diff --git a/cmake/QtSyncQtHelpers.cmake b/cmake/QtSyncQtHelpers.cmake
index 91ed7f28328..2014405017e 100644
--- a/cmake/QtSyncQtHelpers.cmake
+++ b/cmake/QtSyncQtHelpers.cmake
@@ -15,7 +15,7 @@ function(qt_ensure_sync_qt)
     endif()
 
     # When building qtbase, use the source syncqt, otherwise use the installed one.
-    set(SYNCQT_FROM_SOURCE "${QtBase_SOURCE_DIR}/bin/syncqt.pl")
+    set(SYNCQT_FROM_SOURCE "${QtBase_SOURCE_DIR}/libexec/syncqt.pl")
     if(NOT ("${QtBase_SOURCE_DIR}" STREQUAL "") AND EXISTS "${SYNCQT_FROM_SOURCE}")
         set(QT_SYNCQT "${SYNCQT_FROM_SOURCE}" CACHE FILEPATH "syncqt script")
         message(STATUS "Using source syncqt found at: ${QT_SYNCQT}")
@@ -23,10 +23,6 @@ function(qt_ensure_sync_qt)
         qt_path_join(syncqt_install_dir ${QT_INSTALL_DIR} ${INSTALL_LIBEXECDIR})
         qt_copy_or_install(PROGRAMS "${SYNCQT_FROM_SOURCE}"
                            DESTINATION "${syncqt_install_dir}")
-
-        qt_path_join(syncqt_install_dir ${QT_INSTALL_DIR} ${INSTALL_BINDIR})
-        qt_copy_or_install(PROGRAMS "${SYNCQT_FROM_SOURCE}"
-                           DESTINATION "${syncqt_install_dir}")
     elseif(NOT "${QT_HOST_PATH}" STREQUAL "")
         get_filename_component(syncqt_absolute_path
                                "${QT_HOST_PATH}/${QT${PROJECT_VERSION_MAJOR}_HOST_INFO_LIBEXECDIR}/syncqt.pl"
diff --git a/bin/syncqt.pl b/libexec/syncqt.pl
similarity index 100%
rename from bin/syncqt.pl
rename to libexec/syncqt.pl
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
index f7db61a8b2a..9541a560eb6 100644
--- a/mkspecs/features/qt_module_headers.prf
+++ b/mkspecs/features/qt_module_headers.prf
@@ -12,7 +12,7 @@
 load(qt_build_paths)
 
 !build_pass:git_build {
-    qtPrepareTool(QMAKE_SYNCQT, syncqt, , system)
+    qtPrepareLibExecTool(QMAKE_SYNCQT, syncqt, , system)
     minimal_syncqt {
         QMAKE_SYNCQT += -minimal $$QMAKE_SYNCQT_OPTIONS
     } else {