Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
otb
otb
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 298
    • Issues 298
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 14
    • Merge Requests 14
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Incidents
    • Environments
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Main Repositories
  • otbotb
  • Merge Requests
  • !730

Merged
Opened Jul 28, 2020 by Cédric Traizet@ctraizetDeveloper

Freetype and libPNG detection in QT5

  • Overview 5
  • Commits 6
  • Pipelines 12
  • Changes 2

Summary

Bring back a patch that has been removed in 3597436e. The patch has been adapted to be compatible with QT 5.14.1

pkg-config is used in priority when trying to find the system QT5, which fails to find the superbuild version and use the system one instead.

Don't merge this right now. There might be other things to fix for the QT5 superbuild.

Copyright

The copyright owner is CNES and has signed the ORFEO ToolBox Contributor License Agreement.


Check before merging:

  • All discussions are resolved
  • At least 2 👍 votes from core developers, no 👎 vote.
  • The feature branch is (reasonably) up-to-date with the base branch
  • Dashboard is green
  • Copyright owner has signed the ORFEO ToolBox Contributor License Agreement
  • Optionally, run git diff develop... -U0 --no-color | clang-format-diff.py -p1 -i on latest changes and commit
Edited Jul 28, 2020 by Cédric Traizet
Assignee
Assign to
Reviewer
Request review from
7.2.0
Milestone
7.2.0
Assign milestone
Time tracking
Reference: orfeotoolbox/otb!730
Source branch: qt5_libpng