Skip to content
GitLab
  • Menu
Projects Groups Snippets
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • otb otb
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 189
    • Issues 189
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 10
    • Merge requests 10
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Main Repositories
  • otbotb
  • Merge requests
  • !842

Superbuild: compatibility between QT5 and MySQL

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Cédric Traizet requested to merge superbuild_compatibility_qt5_sql into develop Aug 09, 2021
  • Overview 1
  • Commits 2
  • Pipelines 3
  • Changes 2

Summary

the my_bool type has been removed in MySQL>8.0.1. QT5 has been updated to take this change into account. However the fix is integrated into Qt 5.12 and the superbuild uses Qt 5.11. This merge request add a patch to Qt in the Superbuild to add this change and fix compilation on platform using SQL>8.0.1 (e.g Uubntu 20.04)

There are already several patches from QT5 upstream in the Superbuild. We should probably upgrade to a more recent Qt version. At the moment Qt 5.11 is used because it is the last version compatible with Centos-6. But Centos-6 is not maintained anymore, and we have replaced the centos 6 job by a centos 7 job in the CI.

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 Aug 09, 2021 by Cédric Traizet
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: superbuild_compatibility_qt5_sql