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. Pick-to: 6.1 Fixes: QTBUG-91076 Change-Id: I44b014ea41e3f00c420e02fd5c76f11169340b8c Reviewed-by: Kai Koehne <[email protected]>
HoBoIs · Mar 4, 2021 · 800f745 · 800f745
1 parent e01add5
commit 800f745
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/cmake/QtSyncQtHelpers.cmake b/cmake/QtSyncQtHelpers.cmake
@@ -15,18 +15,14 @@ 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}")
 
         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 → libexec/syncqt.pl b/bin/syncqt.pl → libexec/syncqt.pl
diff --git 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 {