diff options
-rw-r--r-- | cmake/QtSyncQtHelpers.cmake | 6 | ||||
-rwxr-xr-x | libexec/syncqt.pl (renamed from bin/syncqt.pl) | 0 | ||||
-rw-r--r-- | mkspecs/features/qt_module_headers.prf | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/cmake/QtSyncQtHelpers.cmake b/cmake/QtSyncQtHelpers.cmake index 91ed7f2832..2014405017 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 index c22cbfa8d0..c22cbfa8d0 100755 --- a/bin/syncqt.pl +++ b/libexec/syncqt.pl diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index f7db61a8b2..9541a560eb 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 { |