Skip to content

Commit

Permalink
Merge pull request #38603 from rosswhitfield/disable_deprecated_qt_api
Browse files Browse the repository at this point in the history
Disable use of C++ API deprecated in Qt 5.15 in preparation for move to Qt6
  • Loading branch information
KedoKudo authored Jan 15, 2025
2 parents 4e65600 + e8ed4da commit 911eca1
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ if(ENABLE_WORKBENCH OR BUILD_MANTIDQT)
find_package(PyQt5 REQUIRED)
find_package(SIP REQUIRED)
separate_arguments(PYQT5_SIP_FLAGS)
# Disable use of C++ API deprecated in Qt 5.15
add_compile_definitions(QT_DISABLE_DEPRECATED_UP_TO=0x050F00)
endif()

# Now add in all the components
Expand Down

0 comments on commit 911eca1

Please sign in to comment.