Merge integration refs/builds/qtci/dev/1617112958

cmake/QtWrapperScriptHelpers.cmake

@@ -152,10 +152,10 @@ function(qt_internal_create_qt_configure_tests_wrapper_script)
         string(APPEND qt_cmake_path ".bat")
         set(script_passed_args "${common_args} %*")
     endif()
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-internal-configure-tests.in"
-                   "${QT_BUILD_DIR}/${INSTALL_BINDIR}/${script_name}")
-    qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/${script_name}"
-               DESTINATION "${INSTALL_BINDIR}")
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libexec/qt-internal-configure-tests.in"
+                   "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${script_name}")
+    qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${script_name}"
+               DESTINATION "${INSTALL_LIBEXECDIR}")
 endfunction()
 
 function(qt_internal_install_android_helper_scripts)

coin/instructions/call_cmake_for_standalone_tests.yaml

@@ -14,7 +14,7 @@ instructions:
       property: host.os
       equals_value: Windows
   - type: ExecuteCommand
-    command: "{{.Env.TESTS_ENV_PREFIX}} {{.Env.INSTALL_DIR_FOR_CMAKE_TESTS}}/bin/qt-internal-configure-tests {{.Env.COIN_CMAKE_ARGS}}"
+    command: "{{.Env.TESTS_ENV_PREFIX}} {{.Env.INSTALL_DIR_FOR_CMAKE_TESTS}}/libexec/qt-internal-configure-tests {{.Env.COIN_CMAKE_ARGS}}"
     executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
     maxTimeInSeconds: 6000
     maxTimeBetweenOutput: 1200