Remove obsolete code related to Qt5

* Remove bundling of openssl1.1 * Remove obsolete compile flags * Remove use of obsolete RimCommandObject * Use QColor::isValidColorName QColor::isValidColor is deprecated in Qt 6.6, QColor::isValidColorName was introduced in 6.4 * Make sure debug DLLs are copied when required * Remove Qt5 from AppFwk * Remove obsolete copy of Qt DLLs
2025-02-25 18:55:39 -06:00 · 2024-10-07 10:16:48 +02:00
parent c75990551a
commit ca4a7b9000
40 changed files with 198 additions and 1194 deletions
--- a/Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt
@@ -6,23 +6,13 @@ if(CAF_ENABLE_UNITY_BUILD)
  set(CMAKE_UNITY_BUILD true)
 endif()

-# Qt
-if(CEE_USE_QT6)
-  find_package(
-    Qt6
-    COMPONENTS
-    REQUIRED Core Gui Widgets
-  )
-  set(QT_LIBRARIES Qt6::Core Qt6::Gui Qt6::Widgets)
-  qt_standard_project_setup()
-else()
-  find_package(
-    Qt5
-    COMPONENTS
-    REQUIRED Core Gui Widgets
-  )
-  set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
-endif()
+find_package(
+  Qt6
+  COMPONENTS
+  REQUIRED Core Gui Widgets
+)
+set(QT_LIBRARIES Qt6::Core Qt6::Gui Qt6::Widgets)
+qt_standard_project_setup()

 set(PROJECT_FILES
    cafFactory.h
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt
@@ -6,22 +6,13 @@ if(CAF_ENABLE_UNITY_BUILD)
  set(CMAKE_UNITY_BUILD true)
 endif()

-if(CEE_USE_QT6)
-  find_package(
-    Qt6
-    COMPONENTS
-    REQUIRED Core
-  )
-  set(QT_LIBRARIES Qt6::Core)
-  qt_standard_project_setup()
-else()
-  find_package(
-    Qt5
-    COMPONENTS
-    REQUIRED Core
-  )
-  set(QT_LIBRARIES Qt5::Core)
-endif()
+find_package(
+  Qt6
+  COMPONENTS
+  REQUIRED Core
+)
+set(QT_LIBRARIES Qt6::Core)
+qt_standard_project_setup()

 set(PROJECT_FILES
    cafAssert.h
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt
@@ -3,21 +3,12 @@ cmake_minimum_required(VERSION 3.15)
 project(cafPdmCore_UnitTests)

 # Qt
-if(CEE_USE_QT6)
-  find_package(
-    Qt6
-    COMPONENTS
-    REQUIRED Core Widgets Gui
-  )
-  qt_standard_project_setup()
-else()
-  find_package(
-    Qt5
-    COMPONENTS
-    REQUIRED Core Gui Widgets
-  )
-  set(QT_LIBRARIES Qt5::Core Qt5::Widgets Qt5::Gui)
-endif()
+find_package(
+  Qt6
+  COMPONENTS
+  REQUIRED Core Widgets Gui
+)
+qt_standard_project_setup()

 if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
  # VS 2017 : Disable warnings from from gtest code, using deprecated code
@@ -43,11 +34,7 @@ set(PROJECT_FILES
    TestObj.h
 )

-if(CEE_USE_QT6)
-  qt_add_executable(${PROJECT_NAME} ${PROJECT_FILES})
-else()
-  add_executable(${PROJECT_NAME} ${PROJECT_FILES})
-endif(CEE_USE_QT6)
+qt_add_executable(${PROJECT_NAME} ${PROJECT_FILES})

 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

@@ -59,10 +46,6 @@ endif()

 source_group("" FILES ${PROJECT_FILES})

-if(Qt5Core_FOUND)
-  set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
-endif()
-
 target_link_libraries(
  ${PROJECT_NAME} PRIVATE cafPdmCore ${QT_LIBRARIES} ${THREAD_LIBRARY}
 )
@@ -84,10 +67,8 @@ install(
  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )

-if(CEE_USE_QT6)
-  qt_generate_deploy_app_script(
-    TARGET ${PROJECT_NAME} OUTPUT_SCRIPT deploy_script
-    NO_UNSUPPORTED_PLATFORM_ERROR NO_TRANSLATIONS
-  )
-  install(SCRIPT ${deploy_script})
-endif(CEE_USE_QT6)
+qt_generate_deploy_app_script(
+  TARGET ${PROJECT_NAME} OUTPUT_SCRIPT deploy_script
+  NO_UNSUPPORTED_PLATFORM_ERROR NO_TRANSLATIONS
+)
+install(SCRIPT ${deploy_script})
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt
@@ -11,24 +11,13 @@ set(MOC_HEADER_FILES cafPdmUiEditorHandle.h cafPdmUiFieldEditorHandle.h
                     cafPdmUiSelection3dEditorVisualizer.h cafQShortenedLabel.h
 )

-# Qt
-if(CEE_USE_QT6)
-  find_package(
-    Qt6
-    COMPONENTS
-    REQUIRED Core Gui Widgets
-  )
-  set(QT_LIBRARIES Qt6::Core Qt6::Gui Qt6::Widgets)
-  qt_standard_project_setup()
-else()
-  find_package(
-    Qt5
-    COMPONENTS
-    REQUIRED Core Gui Widgets
-  )
-  set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
-  qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
-endif()
+find_package(
+  Qt6
+  COMPONENTS
+  REQUIRED Core Gui Widgets
+)
+set(QT_LIBRARIES Qt6::Core Qt6::Gui Qt6::Widgets)
+qt_standard_project_setup()

 set(PROJECT_FILES
    cafInternalPdmFieldTypeSpecializations.h
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafIconProvider.cpp
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafIconProvider.cpp
@@ -162,7 +162,7 @@ std::unique_ptr<QIcon> IconProvider::icon( const QSize& size ) const
    bool validIcon = false;
    if ( !m_backgroundColorStrings.empty() )
    {
-        if ( m_backgroundColorStrings.size() == 1u && QColor::isValidColor( m_backgroundColorStrings.front() ) )
+        if ( m_backgroundColorStrings.size() == 1u && QColor::isValidColorName( m_backgroundColorStrings.front() ) )
        {
            pixmap.fill( QColor( m_backgroundColorStrings.front() ) );
            validIcon = true;
@@ -176,7 +176,7 @@ std::unique_ptr<QIcon> IconProvider::icon( const QSize& size ) const
            QLinearGradient gradient( QPointF( 0.0f, 0.0f ), QPoint( size.width(), 0.0f ) );
            for ( size_t i = 0; i < m_backgroundColorStrings.size(); ++i )
            {
-                if ( !QColor::isValidColor( m_backgroundColorStrings[i] ) )
+                if ( !QColor::isValidColorName( m_backgroundColorStrings[i] ) )
                {
                    validIcon = false;
                    break;
@@ -303,7 +303,7 @@ bool IconProvider::backgroundColorsAreValid() const
        bool validBackgroundColors = true;
        for ( QString colorName : m_backgroundColorStrings )
        {
-            if ( !QColor::isValidColor( colorName ) )
+            if ( !QColor::isValidColorName( colorName ) )
            {
                validBackgroundColors = false;
                break;
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt
@@ -6,23 +6,13 @@ if(CAF_ENABLE_UNITY_BUILD)
  set(CMAKE_UNITY_BUILD true)
 endif()

-# Qt
-if(CEE_USE_QT6)
-  find_package(
-    Qt6
-    COMPONENTS
-    REQUIRED Core Xml
-  )
-  set(QT_LIBRARIES Qt6::Core Qt6::Xml)
-  qt_standard_project_setup()
-else()
-  find_package(
-    Qt5
-    COMPONENTS
-    REQUIRED Core Xml
-  )
-  set(QT_LIBRARIES Qt5::Core Qt5::Xml)
-endif()
+find_package(
+  Qt6
+  COMPONENTS
+  REQUIRED Core Xml
+)
+set(QT_LIBRARIES Qt6::Core Qt6::Xml)
+qt_standard_project_setup()

 set(PROJECT_FILES
    cafInternalPdmFieldIoHelper.cpp
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt
@@ -2,22 +2,13 @@ cmake_minimum_required(VERSION 3.15)

 project(cafPdmXml_UnitTests)

-if(CEE_USE_QT6)
-  find_package(
-    Qt6
-    COMPONENTS
-    REQUIRED Core Xml
-  )
-  set(QT_LIBRARIES Qt6::Core Qt6::Xml)
-  qt_standard_project_setup()
-else()
-  find_package(
-    Qt5
-    COMPONENTS
-    REQUIRED Core Xml
-  )
-  set(QT_LIBRARIES Qt5::Core Qt5::Xml)
-endif()
+find_package(
+  Qt6
+  COMPONENTS
+  REQUIRED Core Xml
+)
+set(QT_LIBRARIES Qt6::Core Qt6::Xml)
+qt_standard_project_setup()

 if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
  # VS 2017 : Disable warnings from from gtest code, using deprecated code
@@ -34,11 +25,7 @@ set(PROJECT_FILES
    cafPdmPtrArrayTest.cpp
 )

-if(CEE_USE_QT6)
-  qt_add_executable(${PROJECT_NAME} ${PROJECT_FILES})
-else()
-  add_executable(${PROJECT_NAME} ${PROJECT_FILES})
-endif(CEE_USE_QT6)
+qt_add_executable(${PROJECT_NAME} ${PROJECT_FILES})

 source_group("" FILES ${PROJECT_FILES})

@@ -46,29 +33,14 @@ target_link_libraries(
  ${PROJECT_NAME} PRIVATE cafPdmXml ${QT_LIBRARIES} ${THREAD_LIBRARY}
 )

-# Copy Qt Dlls
-if(Qt5Core_FOUND)
-  foreach(qtlib ${QT_LIBRARIES})
-    add_custom_command(
-      TARGET ${PROJECT_NAME}
-      POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
-              $<TARGET_FILE_DIR:${PROJECT_NAME}>
-    )
-  endforeach(qtlib)
-endif(Qt5Core_FOUND)
-
-# Install
 install(
  TARGETS ${PROJECT_NAME}
  BUNDLE DESTINATION .
  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )

-if(CEE_USE_QT6)
-  qt_generate_deploy_app_script(
-    TARGET ${PROJECT_NAME} OUTPUT_SCRIPT deploy_script
-    NO_UNSUPPORTED_PLATFORM_ERROR NO_TRANSLATIONS
-  )
-  install(SCRIPT ${deploy_script})
-endif(CEE_USE_QT6)
+qt_generate_deploy_app_script(
+  TARGET ${PROJECT_NAME} OUTPUT_SCRIPT deploy_script
+  NO_UNSUPPORTED_PLATFORM_ERROR NO_TRANSLATIONS
+)
+install(SCRIPT ${deploy_script})
--- a/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt
+++ b/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt
@@ -2,22 +2,12 @@ cmake_minimum_required(VERSION 3.15)

 project(cafProjectDataModel_UnitTests)

-# Qt
-if(CEE_USE_QT6)
-  find_package(
-    Qt6
-    COMPONENTS
-    REQUIRED Core Widgets
-  )
-  qt_standard_project_setup()
-else()
-  find_package(
-    Qt5
-    COMPONENTS
-    REQUIRED Core Xml Gui
-  )
-  set(QT_LIBRARIES Qt5::Core Qt5::Xml Qt5::Gui)
-endif()
+find_package(
+  Qt6
+  COMPONENTS
+  REQUIRED Core Widgets
+)
+qt_standard_project_setup()

 if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
  # VS 2017 : Disable warnings from from gtest code, using deprecated code
@@ -38,11 +28,7 @@ set(PROJECT_FILES
    gtest/gtest-all.cpp
 )

-if(CEE_USE_QT6)
-  qt_add_executable(${PROJECT_NAME} ${PROJECT_FILES})
-else()
-  add_executable(${PROJECT_NAME} ${PROJECT_FILES})
-endif(CEE_USE_QT6)
+qt_add_executable(${PROJECT_NAME} ${PROJECT_FILES})

 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
  target_compile_options(
@@ -57,27 +43,14 @@ target_link_libraries(

 source_group("" FILES ${PROJECT_FILES})

-# Copy Qt Dlls
-foreach(qtlib ${QT_LIBRARIES})
-  add_custom_command(
-    TARGET ${PROJECT_NAME}
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
-            $<TARGET_FILE_DIR:${PROJECT_NAME}>
-  )
-endforeach(qtlib)
-
-# Install
 install(
  TARGETS ${PROJECT_NAME}
  BUNDLE DESTINATION .
  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )

-if(CEE_USE_QT6)
-  qt_generate_deploy_app_script(
-    TARGET ${PROJECT_NAME} OUTPUT_SCRIPT deploy_script
-    NO_UNSUPPORTED_PLATFORM_ERROR NO_TRANSLATIONS
-  )
-  install(SCRIPT ${deploy_script})
-endif(CEE_USE_QT6)
+qt_generate_deploy_app_script(
+  TARGET ${PROJECT_NAME} OUTPUT_SCRIPT deploy_script
+  NO_UNSUPPORTED_PLATFORM_ERROR NO_TRANSLATIONS
+)
+install(SCRIPT ${deploy_script})