Version 4.3.0. Porting Qt 6.

LIHPC-Computational-Geometry · Dec 13, 2023 · caf4098 · caf4098
1 parent 09b5eac
commit caf4098
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.15)
 
 project (QQualif CXX C)
 

diff --git a/cmake/version.cmake b/cmake/version.cmake
@@ -3,8 +3,8 @@
 #
 
 set (QQUALIF_MAJOR_VERSION "4")
-set (QQUALIF_MINOR_VERSION "2")
-set (QQUALIF_RELEASE_VERSION "1")
+set (QQUALIF_MINOR_VERSION "3")
+set (QQUALIF_RELEASE_VERSION "0")
 set (QQUALIF_VERSION ${QQUALIF_MAJOR_VERSION}.${QQUALIF_MINOR_VERSION}.${QQUALIF_RELEASE_VERSION})
 
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -10,8 +10,7 @@ if (BUILD_GQVtk)
 endif (BUILD_GQVtk)
 add_subdirectory (QtQualif)
 
-# those two components currently only compile when either vtk, lima or
-# both are activated
+# those two components currently only compile when either vtk, lima or both are activated
 if (BUILD_GQLima)
   if (BUILD_GQVtk)
     add_subdirectory (QCalQual)

diff --git a/src/QtQualif/CMakeLists.txt b/src/QtQualif/CMakeLists.txt
@@ -5,9 +5,10 @@ find_package (GUIToolkitsVariables)
 
 include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
 include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/common_qt.cmake)
 include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake)
 
-find_package(Qt5Core NO_CMAKE_SYSTEM_PATH)	# In order to enable moc ...
+find_package(Qt${QT_MAJOR}Core NO_CMAKE_SYSTEM_PATH)	# In order to enable moc ...
 find_package (QwtCharts 5 REQUIRED)
 
 file (GLOB HEADERS public/${CURRENT_PACKAGE_NAME}/*.h)

diff --git a/src/QtQualif/QtQualifWidget.cpp b/src/QtQualif/QtQualifWidget.cpp
@@ -18,6 +18,8 @@
 #include <QHBoxLayout>
 #include <QLabel>
 
+#include <qwt_text.h>
+
 #include <assert.h>
 #include <iostream>
 #include <memory>

diff --git a/versions.txt b/versions.txt
@@ -1,3 +1,9 @@
+Version 4.3.0 : 13/12/23
+===============
+
+Portage Qt 6/GUIToolkitsVariables v 1.4.0/QwtCharts v 5.3.0.
+
+
 Version 4.2.0 : 21/06/23
 ===============