Uploaded image for project: 'Qt'
  1. Qt
  2. QTBUG-125534

qt-internal-{ninja,strip}.bat.in are installed as executable

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: P3: Somewhat important P3: Somewhat important
    • 6.9.1, 6.10.0 FF
    • 6.7.1
    • Build System
    • None
    • ba103a6fe (dev), 7138834c9 (6.9)

      These .bat.in files are installed as executable

      • [usr/lib/qt-android-6.7-common/cmake/Qt6/libexec/qt-internal-ninja.bat.in]
      • [usr/lib/qt-android-6.7-common/cmake/Qt6/libexec/qt-internal-strip.bat.in] 

       

      Suggested patch:

      --- a/qtbase/cmake/QtBaseGlobalTargets.cmake
      +++ b/qtbase/cmake/QtBaseGlobalTargets.cmake
      @@ -242,18 +242,24 @@
       )
       
       # Install qt-internal-strip and qt-internal-ninja files.
      -set(__qt_internal_strip_wrappers
      +set(__qt_internal_strip_wrappers_programs
           libexec/qt-internal-strip.in
      -    libexec/qt-internal-strip.bat.in
           libexec/qt-internal-ninja.in
      +)
      +set(__qt_internal_strip_wrappers_files
      +    libexec/qt-internal-strip.bat.in
           libexec/qt-internal-ninja.bat.in
       )
       qt_copy_or_install(PROGRAMS
      -    ${__qt_internal_strip_wrappers}
      +    ${__qt_internal_strip_wrappers_programs}
      +    DESTINATION "${__GlobalConfig_install_dir}/libexec"
      +)
      +qt_copy_or_install(FILES
      +    ${__qt_internal_strip_wrappers_files}
           DESTINATION "${__GlobalConfig_install_dir}/libexec"
       )
       if(QT_WILL_INSTALL)
      -    foreach(__qt_internal_strip_wrapper ${__qt_internal_strip_wrappers})
      +    foreach(__qt_internal_strip_wrapper ${__qt_internal_strip_wrappers_programs} ${__qt_internal_strip_wrappers_files})
               file(COPY "${__qt_internal_strip_wrapper}"
                    DESTINATION "${__GlobalConfig_build_dir}/libexec")
           endforeach()
       

        For Gerrit Dashboard: QTBUG-125534
        # Subject Branch Project Status CR V

            jbornema Joerg Bornemann
            ban F S
            Votes:
            0 Vote for this issue
            Watchers:
            4 Start watching this issue

              Created:
              Updated:
              Resolved:

                There are no open Gerrit changes