Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

qt5: fix build with apple-clang 15 + add package_type + bump deps + use version range for zlib #20093

Merged
merged 12 commits into from
Oct 26, 2023
Merged

qt5: fix build with apple-clang 15 + add package_type + bump deps + use version range for zlib #20093

merged 12 commits into from
Oct 26, 2023

Commits on Sep 24, 2023

  1. fix qmake build with apple-clang 15

    @SpaceIm
    SpaceIm committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    42130b2 View commit details
    Browse the repository at this point in the history

  2. fix build with apple-clang 15 when deployment target of macOS is < 14 

    see https://bugreports.qt.io/browse/QTBUG-114316
    @SpaceIm
    SpaceIm committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    86c4c8e View commit details
    Browse the repository at this point in the history

  3. improve robustness of macOS builds when deps are shared

    @SpaceIm
    SpaceIm committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    f9c91fa View commit details
    Browse the repository at this point in the history

  4. add package_type

    @SpaceIm
    SpaceIm committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    36bfb78 View commit details
    Browse the repository at this point in the history

  5. use is_msvc_static_runtime()

    @SpaceIm
    SpaceIm committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    69ec16b View commit details
    Browse the repository at this point in the history

  6. use host_version for wayland in build requirements

    @SpaceIm
    SpaceIm committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    37e602f View commit details
    Browse the repository at this point in the history

  7. bump dependencies + use version range for zlib

    @SpaceIm
    SpaceIm committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    25756b3 View commit details
    Browse the repository at this point in the history

  8. decrease min conan v2 version, 2.0.5 is enough for <host_version>

    @SpaceIm
    SpaceIm committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    27b45dc View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2023

  1. adapt patches to each version

    @SpaceIm
    SpaceIm committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    9938beb View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. Merge branch 'master' into fix/qt5-apple-clang15

    @SpaceIm
    SpaceIm committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    0ca5889 View commit details
    Browse the repository at this point in the history

  2. bump dependencies

    @SpaceIm
    SpaceIm committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    4576ae5 View commit details
    Browse the repository at this point in the history

  3. also patch 5.15.11

    @SpaceIm
    SpaceIm committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    9d78ba6 View commit details
    Browse the repository at this point in the history