Cmake cleanup and selected Qt6 adjustments

- Avoid warning using newer CMake by removing obsolete cmake requirements in sub projects
- Several adjustments preparing for Qt6

ApplicationExeCode/RiaMain.cpp

@@ -181,7 +181,7 @@ int main( int argc, char* argv[] )
                         if ( file.open( QIODevice::WriteOnly | QIODevice::Text ) )
                         {
                             QTextStream out( &file );
-                            out << portNumber << endl;
+                            out << portNumber << "\n";
                         }
                         file.close();
 

ApplicationLibCode/Commands/ExportCommands/RicSnapshotViewToFileFeature.cpp

@@ -38,7 +38,6 @@
 #include <QAction>
 #include <QClipboard>
 #include <QDebug>
-#include <QDesktopWidget>
 #include <QFileInfo>
 #include <QMdiSubWindow>
 #include <QPageLayout>

ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp

@@ -319,8 +319,7 @@ QDateTime RimSummaryTimeAxisProperties::fromDisplayTimeToDate( double displayTim
     time_t          startOfSimulation = rimSummaryPlot->firstTimeStepOfFirstCurve();
 
     time_t    secsSinceSimulationStart = displayTime / fromTimeTToDisplayUnitScale();
-    QDateTime date;
+    QDateTime date                     = RiaQDateTimeTools::fromTime_t( startOfSimulation + secsSinceSimulationStart );
-    date.setTime_t( startOfSimulation + secsSinceSimulationStart );
 
     return date;
 }

ApplicationLibCode/UserInterface/RiuMainWindow.cpp

@@ -92,6 +92,7 @@
 #include "DockManager.h"
 
 #include <QAction>
+#include <QActionGroup>
 #include <QCloseEvent>
 #include <QComboBox>
 #include <QDir>

ApplicationLibCode/UserInterface/RiuMultiPlotPage.cpp

@@ -58,7 +58,6 @@
 #include "qwt_scale_widget.h"
 
 #include <QDebug>
-#include <QDesktopWidget>
 #include <QFocusEvent>
 #include <QFontMetrics>
 #include <QGraphicsDropShadowEffect>

Fwk/AppFwk/cafHexInterpolator/cafHexInterpolator.h

@@ -39,7 +39,7 @@
 /*
 Interpolating inside a general 8 node hexahedral element
 Calculating an interpolated value at a position inside the element from values at each corner.
-Author Jacob Støren
+Author Jacob Storen
 
                   | v1 |
 Vectors:    [v] = | v2 | = { v1, v2, v3 }

Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt

@@ -14,6 +14,7 @@ set(MOC_HEADER_FILES MainWindow.h WidgetLayoutTest.h CustomObjectEditor.h
 
 # Resource file
 set(QRC_FILES ${QRC_FILES} textedit.qrc)
+message("QRC_FILES: ${QRC_FILES}")
 
 if(CEE_USE_QT6)
   find_package(
@@ -23,6 +24,7 @@ if(CEE_USE_QT6)
   )
   set(QT_LIBRARIES Qt6::Core Qt6::Gui Qt6::Widgets Qt6::OpenGL Qt6::Svg)
   qt_standard_project_setup()
+  set(CMAKE_AUTORCC ON)
 else()
   find_package(
     Qt5
@@ -64,7 +66,7 @@ if(CEE_USE_QT6)
     ${PROJECT_NAME}
     ${PROJECT_FILES}
     ${MOC_SOURCE_FILES}
-    ${QRC_FILES_CPP}
+    ${QRC_FILES}
     $<TARGET_OBJECTS:cafCommandFeatures> # Needed for cmake version < 3.12.
                                          # Remove
     # when we can use target_link_libraries with OBJECT libraries

Fwk/AppFwk/cafViewer/CMakeLists.txt

@@ -42,8 +42,6 @@ add_library(
   cafNavigationPolicy.cpp
   cafNavigationPolicy.h
   cafPointOfInterestVisualizer.h
-  cafOpenGLWidget.cpp
-  cafOpenGLWidget.h
   cafViewer.cpp
   cafViewer.h
   ${MOC_SOURCE_FILES}

ThirdParty/Ert/CMakeLists.txt

@@ -1,4 +1,3 @@
-cmake_minimum_required( VERSION 2.8.12 ) # If you are creating Python wrappers for Windows, the actual version requirement is 3.4
 project( ERT C CXX )
 
 include(GNUInstallDirs)

ThirdParty/Ert/external/catch2/CMakeLists.txt

@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
 project(catch2 CXX)
 
 # Dummy source file added because INTERFACE type

ThirdParty/NRLib/CMakeLists.txt

@@ -1,5 +1,3 @@
-cmake_minimum_required (VERSION 2.8.12)
-
 project (NRLib)
 
 if (CMAKE_COMPILER_IS_GNUCXX)

ThirdParty/NRLib/nrlib/well/laswell.hpp

@@ -1,12 +1,12 @@
-// $Id: laswell.hpp 1244 2014-02-24 15:57:16Z hauge $
+// $Id: laswell.hpp 1244 2014-02-24 15:57:16Z hauge $
 
 // Copyright (c)  2011, Norwegian Computing Center
 // All rights reserved.
 // Redistribution and use in source and binary forms, with or without modification,
 // are permitted provided that the following conditions are met:
-// •  Redistributions of source code must retain the above copyright notice, this
+// •  Redistributions of source code must retain the above copyright notice, this
 //    list of conditions and the following disclaimer.
-// •  Redistributions in binary form must reproduce the above copyright notice, this list of
+// •  Redistributions in binary form must reproduce the above copyright notice, this list of
 //    conditions and the following disclaimer in the documentation and/or other materials
 //    provided with the distribution.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY

ThirdParty/NRLib/nrlib/well/well.hpp

@@ -1,12 +1,12 @@
-// $Id: well.hpp 883 2011-09-26 09:17:05Z perroe $
+// $Id: well.hpp 883 2011-09-26 09:17:05Z perroe $
 
 // Copyright (c)  2011, Norwegian Computing Center
 // All rights reserved.
 // Redistribution and use in source and binary forms, with or without modification,
 // are permitted provided that the following conditions are met:
-// •  Redistributions of source code must retain the above copyright notice, this
+// •  Redistributions of source code must retain the above copyright notice, this
 //    list of conditions and the following disclaimer.
-// •  Redistributions in binary form must reproduce the above copyright notice, this list of
+// •  Redistributions in binary form must reproduce the above copyright notice, this list of
 //    conditions and the following disclaimer in the documentation and/or other materials
 //    provided with the distribution.
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY

ThirdParty/clipper/CMakeLists.txt

@@ -1,5 +1,3 @@
-cmake_minimum_required (VERSION 2.8.12)
-
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-copy")
 endif()

ThirdParty/custom-opm-common/CMakeLists.txt

@@ -1,6 +1,3 @@
-cmake_minimum_required (VERSION 2.8.12)
-
-# Languages and global compiler settings
 if(CMAKE_VERSION VERSION_LESS 3.8)
   message(WARNING "CMake version does not support c++17, guessing -std=c++17")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")

ThirdParty/custom-opm-flowdiag-app/CMakeLists.txt

@@ -1,5 +1,3 @@
-cmake_minimum_required (VERSION 2.8.12)
-
 project (custom-opm-flowdiag-app)
 
 if (CMAKE_COMPILER_IS_GNUCXX)

ThirdParty/custom-opm-flowdiagnostics/CMakeLists.txt

@@ -1,5 +1,3 @@
-cmake_minimum_required (VERSION 2.8.12)
-
 project (custom-opm-flowdiagnostics)
 
 if (CMAKE_COMPILER_IS_GNUCXX)

ThirdParty/expressionparser/CMakeLists.txt

@@ -1,5 +1,3 @@
-cmake_minimum_required (VERSION 2.8.12)
-
 project (expressionparser)
 
 if(MSVC) 

ThirdParty/nightcharts/CMakeLists.txt

@@ -1,5 +1,3 @@
-cmake_minimum_required (VERSION 2.8.12)
-
 project (nightcharts)
 
 if (CEE_USE_QT6)