1. 08 Mar, 2022 10 commits
  2. 03 Mar, 2022 2 commits
  3. 28 Feb, 2022 8 commits
  4. 31 Jan, 2022 1 commit
  5. 21 Jan, 2022 2 commits
  6. 01 Nov, 2021 1 commit
  7. 08 Oct, 2021 1 commit
    • Jörg Bornemann's avatar
      Don't use libs in /usr/local for configure tests by default on macOS · 2edca1c1
      Jörg Bornemann authored
      
      
      Since commit f3c7d22dd04afe8d889585fb5d6426f3d4591e74 we do not use
      libraries from /usr/local and other non-system locations on macOS.  But
      our configure tests still did.  This led to discrepancies between
      find_package calls in configure tests and the Qt project itself.
      
      Mentioned commit removed /usr/local and friends from
      CMAKE_SYSTEM_PREFIX_PATH.  But we can't pass this variable to the
      configure tests, because CMake sets it up and overwrites our value.
      
      Pass CMAKE_SYSTEM_PREFIX_PATH and CMAKE_SYSTEM_FRAMEWORK_PATH as
      QT_CONFIGURE_TEST_CMAKE_SYSTEM_{PREFIX|FRAMEWORK}_PATH variables to
      tests.
      
      Tests with separate project files that call find_package() must add code
      like this after the project() command:
      
      if(DEFINED QT_CONFIGURE_TEST_CMAKE_SYSTEM_PREFIX_PATH)
          set(CMAKE_SYSTEM_PREFIX_PATH
              "${QT_CONFIGURE_TEST_CMAKE_SYSTEM_PREFIX_PATH}")
      endif()
      if(DEFINED QT_CONFIGURE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH)
          set(CMAKE_SYSTEM_FRAMEWORK_PATH
              "${QT_CONFIGURE_TEST_CMAKE_SYSTEM_FRAMEWORK_PATH}")
      endif()
      
      Adjust pro2cmake accordingly.
      
      Task-number: QTBUG-97076
      Change-Id: Iac1622768d1200e6ea63be569eef12b7eada6c76
      Reviewed-by: default avatarQt CI Bot <qt_ci_bot@qt-project.org>
      Reviewed-by: Alexandru Croitor's avatarAlexandru Croitor <alexandru.croitor@qt.io>
      2edca1c1
  8. 27 Sep, 2021 3 commits
    • Alexandru Croitor's avatar
      pro2cmake: Generate public CMake API code for projects by default · f18055cb
      Alexandru Croitor authored
      
      
      Previously pro2cmake assumed that all .pro were internal Qt projects
      like qtbase/src/corelib.pro and generated private api calls like
      qt_internal_add_module().
      
      Public CMake API calls (like qt_add_executable) were only generated if
      an --is-example command line flag was passed to the script or if the
      .pro file was located under the examples subfolder of a qt repo source
      directory (indicated by the presence of a .qmake.conf file).
      
      Change the logic to always generate public CMake API code by default,
      unless a .cmake.conf/.qmake.conf file is encountered with a valid repo
      module version inside, in which case apply the old heuristic of
      checking for the ./examples subfolder.
      
      The intention is to have a sensible default so that Qt users can use
      the script to more easily migrate their qmake projects without having
      to explicitly specify the --is-example flag.
      
      Pick-to: 6.2
      Task-number: QTBUG-96799
      Change-Id: I38f4f1b349a5b9688cf7bc5914d4fde72e660a98
      Reviewed-by: Jörg Bornemann's avatarJoerg Bornemann <joerg.bornemann@qt.io>
      f18055cb
    • Alexandru Croitor's avatar
      pro2cmake: Augment searching of .qmake.conf with .cmake.conf · 712af726
      Alexandru Croitor authored
      
      
      Adapt to fb656c036db0549180073e133773862d08f6cd24 which removes
      .qmake.conf files in repos by searching for either .qmake.conf or
      .cmake.conf.
      
      The locations of those files are only used to compute relative paths
      based on the directory where the conf file is.
      
      For now, remove the warning if a conf file is not found, because we
      intend to change the script to generate user project code by default,
      instead of Qt internal project code and the warning looks scary.
      
      Pick-to: 6.2
      Task-number: QTBUG-96799
      Change-Id: I301e93d2ce5c05a52877eb6ed9eb9cee54fc5b15
      Reviewed-by: Jörg Bornemann's avatarJoerg Bornemann <joerg.bornemann@qt.io>
      712af726
    • Jörg Bornemann's avatar
      Skip unnecessary commands when cross-building tools · bd876da7
      Jörg Bornemann authored
      
      
      Introduce a new macro qt_internal_return_unless_building_tools which
      simply calls return() if tools are not built.  This macro is supposed to
      be called after qt_internal_add_tool().
      
      Using this macro avoids having to special-case code for when
      qt_internal_add_tool() creates imported targets in cross-builds.
      
      Adjust pro2cmake accordingly.
      
      Task-number: QTBUG-85084
      Change-Id: I9e1c455c29535dd8c318efa890ebd739c42effc1
      Reviewed-by: Alexandru Croitor's avatarAlexandru Croitor <alexandru.croitor@qt.io>
      bd876da7
  9. 22 Sep, 2021 1 commit
  10. 17 Sep, 2021 1 commit
  11. 09 Sep, 2021 2 commits
  12. 08 Sep, 2021 1 commit
  13. 02 Aug, 2021 1 commit
  14. 01 Jul, 2021 1 commit
  15. 22 Jun, 2021 1 commit
  16. 11 Jun, 2021 1 commit
  17. 10 Jun, 2021 2 commits
  18. 03 Jun, 2021 1 commit
    • Niclas Rosenvik's avatar
      Fix support for using system supplied md4c library · c8d738c8
      Niclas Rosenvik authored and Shawn Rutledge's avatar Shawn Rutledge committed
      
      
      Add FindWrapSystemMd4c.cmake so that the old md4c target can be used
      as well as the new one and set WrapSystemMd4c_FOUND.
      Link to the imported target WrapSystemMd4c::WrapSystemMd4c if the
      system library is used.
      Add qt_find_package line to find the package in configure.cmake.
      Fix the condition for enabling system-textmarkdownreader, it includes
      testing for textmarkdownreader because even if the code would compile
      correctly without it, it looks strange when the output says
      "textmarkdownreader no" and under "using system libmd4c yes" even if
      libmd4c is not used.
      Use system include when system-markdownreader is enabled.
      Add library mapping for libmd4c.
      
      Change-Id: Id5d5b13d6691a8c1cdf627238887977c847c1e67
      Reviewed-by: Shawn Rutledge's avatarShawn Rutledge <shawn.rutledge@qt.io>
      Reviewed-by: Alexandru Croitor's avatarAlexandru Croitor <alexandru.croitor@qt.io>
      c8d738c8