Version 1.4.0. Support for Qt 5 and 6.

Charles PIGNEROL · Charles PIGNEROL · commit 85aee5aa8439 · 2023-12-13T14:47:23.000+01:00
diff --git a/cmake/common_qt.cmake b/cmake/common_qt.cmake
@@ -0,0 +1,19 @@
+set (QT_5 OFF)
+set (QT_6 OFF)
+unset (QT_MAJOR)
+if (Qt6_DIR OR Qt6_ROOT)
+	find_package (Qt6 REQUIRED COMPONENTS Core)
+	if (Qt6_FOUND)
+		set (QT_6 ON)
+		set (QT_MAJOR 6)
+	endif (Qt6_FOUND)
+elseif (Qt5_DIR OR Qt5_ROOT)
+	find_package (Qt5 REQUIRED COMPONENTS Core)
+	if (Qt5_FOUND)
+		set (QT_5 ON)
+		set (QT_MAJOR 5)
+	endif (Qt5_FOUND)
+else ( )
+	message (FATAL_ERROR "Version majeure de Qt non gérée.")
+endif ( )
+
diff --git a/cmake/version.cmake b/cmake/version.cmake
@@ -3,6 +3,6 @@
 #
 
 set (GUI_TOOLKITS_VARIABLES_MAJOR_VERSION "1")
-set (GUI_TOOLKITS_VARIABLES_MINOR_VERSION "3")
-set (GUI_TOOLKITS_VARIABLES_RELEASE_VERSION "3")
+set (GUI_TOOLKITS_VARIABLES_MINOR_VERSION "4")
+set (GUI_TOOLKITS_VARIABLES_RELEASE_VERSION "0")
 set (GUI_TOOLKITS_VARIABLES_VERSION ${GUI_TOOLKITS_VARIABLES_MAJOR_VERSION}.${GUI_TOOLKITS_VARIABLES_MINOR_VERSION}.${GUI_TOOLKITS_VARIABLES_RELEASE_VERSION})
diff --git a/versions.txt b/versions.txt
@@ -1,3 +1,10 @@
+Version 1.4.0 : 13/12/23
+===============
+
+cmake/common_qt.cmake : support de différentes versions de Qt. Utilise (Qt*_DIR OR Qt*_ROOT) pour déterminer la version utilisée de Qt.
+Permet d'assurer la compatibilité Qt 5 et 6 au sein d'un projet.
+
+
 Version 1.3.1 : 18/07/23
 ===============
 

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`#`
`4`	`4`
`5`	`5`	`set (GUI_TOOLKITS_VARIABLES_MAJOR_VERSION "1")`
`6`		`-set (GUI_TOOLKITS_VARIABLES_MINOR_VERSION "3")`
`7`		`-set (GUI_TOOLKITS_VARIABLES_RELEASE_VERSION "3")`
	`6`	`+set (GUI_TOOLKITS_VARIABLES_MINOR_VERSION "4")`
	`7`	`+set (GUI_TOOLKITS_VARIABLES_RELEASE_VERSION "0")`
`8`	`8`	`set (GUI_TOOLKITS_VARIABLES_VERSION ${GUI_TOOLKITS_VARIABLES_MAJOR_VERSION}.${GUI_TOOLKITS_VARIABLES_MINOR_VERSION}.${GUI_TOOLKITS_VARIABLES_RELEASE_VERSION})`