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
OPM · Oct 7, 2024 · ca4a7b9 · ca4a7b9
1 parent c759905
commit ca4a7b9
Show file tree

Hide file tree

Showing 40 changed files with 198 additions and 1,194 deletions.
diff --git a/ApplicationExeCode/CMakeLists.txt b/ApplicationExeCode/CMakeLists.txt
@@ -197,13 +197,6 @@ if(MSVC)
 
   set(BUILD_FLAGS_FOR_MSVC "/wd4190 /wd4100 /wd4127 /wd4245 /wd4005")
 
-  if(CMAKE_CXX_COMPILER_VERSION LESS_EQUAL 19.14)
-    # The following warning is generated over 800 times from a qwt header only
-    # using VS2015 Disabling temporarily warning C4505 'function' : unreferenced
-    # local function has been removed
-    set(BUILD_FLAGS_FOR_MSVC "${BUILD_FLAGS_FOR_MSVC} /wd4505")
-  endif()
-
   message(STATUS "BUILD_FLAGS_FOR_MSVC ${BUILD_FLAGS_FOR_MSVC}")
   set_target_properties(
     ResInsight PROPERTIES COMPILE_FLAGS ${BUILD_FLAGS_FOR_MSVC}
@@ -444,8 +437,8 @@ if(RESINSIGHT_PRIVATE_INSTALL)
     add_custom_command(
       TARGET ResInsight
       POST_BUILD
-      COMMAND ${WINDEPLOYQT_EXECUTABLE} $<TARGET_FILE:ResInsight> --release
-              --no-translations
+      COMMAND ${WINDEPLOYQT_EXECUTABLE} $<TARGET_FILE:ResInsight>
+              "$<IF:$<CONFIG:Debug>,--debug,--release>" --no-translations
       COMMENT
         "Running windeployqt to deploy Qt dependencies to the build folder, required by install()"
     )

diff --git a/ApplicationLibCode/Application/RiaApplication.cpp b/ApplicationLibCode/Application/RiaApplication.cpp
@@ -48,7 +48,6 @@
 
 #include "Rim2dIntersectionViewCollection.h"
 #include "RimCellFilterCollection.h"
-#include "RimCommandObject.h"
 #include "RimCommandRouter.h"
 #include "RimCompletionTemplateCollection.h"
 #include "RimEclipseCaseCollection.h"
@@ -789,18 +788,6 @@ bool RiaApplication::loadProject( const QString& projectFileName, ProjectLoadAct
     // Default behavior for scripts is to use current active view for data read/write
     onProjectOpened();
 
-    // Loop over command objects and execute them
-    for ( size_t i = 0; i < m_project->commandObjects.size(); i++ )
-    {
-        m_commandQueue.push_back( m_project->commandObjects[i] );
-    }
-
-    // Lock the command queue
-    m_commandQueueLock.lock();
-
-    // Execute command objects, and release the mutex when the queue is empty
-    executeCommandObjects();
-
     // Recalculate the results from grid property calculations.
     // Has to be done late since the results are filtered by view cell visibility
     for ( auto gridCalculation : m_project->gridCalculationCollection()->sortedGridCalculations() )
@@ -883,7 +870,6 @@ void RiaApplication::closeProject()
     onProjectBeingClosed();
 
     m_project->close();
-    m_commandQueue.clear();
 
     RiaWellNameComparer::clearCache();
 
@@ -1383,81 +1369,6 @@ void RiaApplication::executeCommandFile( const QString& commandFile )
     RicfCommandFileExecutor::instance()->executeCommands( in );
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RiaApplication::addCommandObject( RimCommandObject* commandObject )
-{
-    m_commandQueue.push_back( commandObject );
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RiaApplication::executeCommandObjects()
-{
-    {
-        auto currentCommandQueue = m_commandQueue;
-        for ( auto command : currentCommandQueue )
-        {
-            if ( !command->isAsyncronous() )
-            {
-                command->redo();
-                m_commandQueue.remove( command );
-            }
-        }
-    }
-
-    if ( !m_commandQueue.empty() )
-    {
-        auto it = m_commandQueue.begin();
-        if ( it->notNull() )
-        {
-            RimCommandObject* first = *it;
-            first->redo();
-        }
-        m_commandQueue.pop_front();
-    }
-    else
-    {
-        // Unlock the command queue lock when the command queue is empty
-        // Required to lock the mutex before unlocking to avoid undefined behavior
-        m_commandQueueLock.tryLock();
-        m_commandQueueLock.unlock();
-    }
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void RiaApplication::waitUntilCommandObjectsHasBeenProcessed()
-{
-    auto         start            = std::chrono::system_clock::now();
-    const double timeoutThreshold = 5.0;
-
-    // Wait until all command objects have completed
-    bool mutexLockedSuccessfully = m_commandQueueLock.tryLock();
-
-    while ( !mutexLockedSuccessfully )
-    {
-        invokeProcessEvents();
-
-        mutexLockedSuccessfully = m_commandQueueLock.tryLock();
-
-        std::chrono::duration<double> elapsed_seconds = std::chrono::system_clock::now() - start;
-        if ( timeoutThreshold < elapsed_seconds.count() )
-        {
-            // This can happen if the octave plugins fails to execute during regression testing.
-
-            RiaLogging::warning(
-                QString( "Timeout waiting for command objects to complete, timeout set to %1 seconds." ).arg( timeoutThreshold ) );
-            break;
-        }
-    }
-
-    m_commandQueueLock.unlock();
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

diff --git a/ApplicationLibCode/Application/RiaApplication.h b/ApplicationLibCode/Application/RiaApplication.h
@@ -49,7 +49,6 @@ class RiaSocketServer;
 
 class RigEclipseCaseData;
 
-class RimCommandObject;
 class RimCommandRouter;
 class RimEclipseCase;
 class RimEclipseView;
@@ -180,9 +179,6 @@ class RiaApplication
     QVariant cacheDataObject( const QString& key ) const;
 
     void executeCommandFile( const QString& commandFile );
-    void addCommandObject( RimCommandObject* commandObject );
-    void executeCommandObjects();
-    void waitUntilCommandObjectsHasBeenProcessed();
 
     const QString startDir() const;
     void          setStartDir( const QString& startDir );
@@ -253,9 +249,6 @@ class RiaApplication
     QString                    m_commandLineHelpText;
     QMap<QString, QVariant>    m_sessionCache; // Session cache used to store username/passwords per session
 
-    std::list<caf::PdmPointer<RimCommandObject>> m_commandQueue;
-    QMutex                                       m_commandQueueLock;
-
     bool m_runningWorkerProcess;
 
 private:

diff --git a/ApplicationLibCode/Application/RiaGuiApplication.cpp b/ApplicationLibCode/Application/RiaGuiApplication.cpp
@@ -50,7 +50,6 @@
 #include "RimAnnotationCollection.h"
 #include "RimAnnotationInViewCollection.h"
 #include "RimAnnotationTextAppearance.h"
-#include "RimCommandObject.h"
 #include "RimEclipseCaseCollection.h"
 #include "RimEclipseView.h"
 #include "RimFlowPlotCollection.h"
@@ -1574,9 +1573,6 @@ void RiaGuiApplication::slotWorkerProcessFinished( int exitCode, QProcess::ExitS
     }
     m_workerProcess = nullptr;
 
-    // Always make sure the command objects are executed before any return statement
-    executeCommandObjects();
-
     // Either the work process crashed or was aborted by the user
     if ( exitStatus == QProcess::CrashExit )
     {

diff --git a/ApplicationLibCode/Application/RiaGuiApplication.h b/ApplicationLibCode/Application/RiaGuiApplication.h
@@ -43,7 +43,6 @@ class RiaSocketServer;
 
 class RigEclipseCaseData;
 
-class RimCommandObject;
 class RimEclipseCase;
 class RimEclipseView;
 class RimGridView;

diff --git a/ApplicationLibCode/Application/Tools/RiaRegressionTestRunner.cpp b/ApplicationLibCode/Application/Tools/RiaRegressionTestRunner.cpp
@@ -240,9 +240,6 @@ void RiaRegressionTestRunner::runRegressionTest()
 
                 app->loadProject( testCaseFolder.filePath( projectFileName ), RiaApplication::ProjectLoadAction::PLA_NONE, projectModifier.p() );
 
-                // Wait until all command objects have completed
-                app->waitUntilCommandObjectsHasBeenProcessed();
-
                 QString fullPathGeneratedFolder = testCaseFolder.absoluteFilePath( generatedFolderName );
                 if ( regressionTestConfig.exportSnapshots3dViews )
                 {

diff --git a/ApplicationLibCode/CMakeLists.txt b/ApplicationLibCode/CMakeLists.txt
@@ -277,13 +277,6 @@ if(MSVC)
 
   message(STATUS "CMAKE_CXX_COMPILER_VERSION ${CMAKE_CXX_COMPILER_VERSION}")
 
-  if(CMAKE_CXX_COMPILER_VERSION LESS_EQUAL 19.14)
-    # The following warning is generated over 800 times from a qwt header only
-    # using VS2015 Disabling temporarily warning C4505 'function' : unreferenced
-    # local function has been removed
-    set(BUILD_FLAGS_FOR_MSVC "${BUILD_FLAGS_FOR_MSVC} /wd4505")
-  endif()
-
   if(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 19.38)
     # https://github.com/OPM/ResInsight/issues/10844
     set(BUILD_FLAGS_FOR_MSVC "${BUILD_FLAGS_FOR_MSVC} /wd4996")

diff --git a/ApplicationLibCode/Commands/CMakeLists.txt b/ApplicationLibCode/Commands/CMakeLists.txt
@@ -123,13 +123,6 @@ if(MSVC)
 
   set(BUILD_FLAGS_FOR_MSVC "/W3 /wd4190 /wd4100 /wd4127")
 
-  if(CMAKE_CXX_COMPILER_VERSION LESS_EQUAL 19.14)
-    # The following warning is generated over 800 times from a qwt header only
-    # using VS2015 Disabling temporarily warning C4505 'function' : unreferenced
-    # local function has been removed
-    set(BUILD_FLAGS_FOR_MSVC "${BUILD_FLAGS_FOR_MSVC} /wd4505")
-  endif()
-
   if(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 19.38)
     # https://github.com/OPM/ResInsight/issues/10844
     set(BUILD_FLAGS_FOR_MSVC "${BUILD_FLAGS_FOR_MSVC} /wd4996")

diff --git a/ApplicationLibCode/FileInterface/RifColorLegendData.cpp b/ApplicationLibCode/FileInterface/RifColorLegendData.cpp
@@ -88,7 +88,7 @@ cvf::ref<RigFormationNames> RifColorLegendData::readLyrFormationNameFile( const
             // extract last word which may contain formation color
             QString colorWord = RiaTextStringTools::splitSkipEmptyParts( numberString ).last();
 
-            if ( QColor::isValidColor( colorWord ) ) numberString.remove( colorWord ); // remove color if present as last word on line
+            if ( QColor::isValidColorName( colorWord ) ) numberString.remove( colorWord ); // remove color if present as last word on line
 
             // extract words containing formation number(s)
             QStringList numberWords = RiaTextStringTools::splitSkipEmptyParts( numberString, QRegExp( "-" ) );
@@ -110,7 +110,7 @@ cvf::ref<RigFormationNames> RifColorLegendData::readLyrFormationNameFile( const
                 startK  = tmp < endK ? tmp : endK;
                 endK    = tmp > endK ? tmp : endK;
 
-                if ( QColor::isValidColor( colorWord ) ) // formation color present at end of line
+                if ( QColor::isValidColorName( colorWord ) ) // formation color present at end of line
                 {
                     cvf::Color3f formationColor;
 
@@ -133,7 +133,7 @@ cvf::ref<RigFormationNames> RifColorLegendData::readLyrFormationNameFile( const
                     continue;
                 }
 
-                if ( QColor::isValidColor( colorWord ) ) // formation color present at end of line
+                if ( QColor::isValidColorName( colorWord ) ) // formation color present at end of line
                 {
                     cvf::Color3f formationColor;
 

diff --git a/ApplicationLibCode/ProjectDataModel/CMakeLists_files.cmake b/ApplicationLibCode/ProjectDataModel/CMakeLists_files.cmake
@@ -30,7 +30,6 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimReservoirCellResultsStorage.h
     ${CMAKE_CURRENT_LIST_DIR}/RimEclipseStatisticsCaseEvaluator.h
     ${CMAKE_CURRENT_LIST_DIR}/RimMimeData.h
-    ${CMAKE_CURRENT_LIST_DIR}/RimCommandObject.h
     ${CMAKE_CURRENT_LIST_DIR}/RimTools.h
     ${CMAKE_CURRENT_LIST_DIR}/RimFormationNames.h
     ${CMAKE_CURRENT_LIST_DIR}/RimFormationNamesCollection.h
@@ -168,7 +167,6 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimReservoirCellResultsStorage.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimEclipseStatisticsCaseEvaluator.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimMimeData.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RimCommandObject.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimTools.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimFormationNames.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimFormationNamesCollection.cpp