Merge pull request #3 from LIHPC-Computational-Geometry/qt6port

CharlesPignerol · web-flow · commit 0359e8313a92 · 2023-12-13T16:45:49.000+01:00
Version 6.3.0. Porting Qt6.
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 (Preferences CXX)
 
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -4,7 +4,6 @@
       {
         "name": "ci",
         "cacheVariables": {
-          "GUIToolkitsVariables_ROOT": "$env{INSTALL_DIR}/guitoolkitsvariables",
           "TkUtil_ROOT": "$env{INSTALL_DIR}/tkutil",
           "QtUtil_ROOT": "$env{INSTALL_DIR}/qtutil"
         }
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # preferences
 
-![spack-ci](https://github.com/LIHPC-Computational-Geometry/preferences/actions/workflows/spack-ci.yml/badge.svg)
-
 Library of user preference management utilities based on [XercesC](https://xerces.apache.org/xerces-c/) and [Qt](https://www.qt.io/).
 
-This project is part of the [magix3d](https://github.com/LIHPC-Computational-Geometry/magix3d) ecosystem and conforms to its [CI policy](https://github.com/LIHPC-Computational-Geometry/spack_recipes#development-in-magix3d-ecosystem-projects).
+This project is a dependency of the [mgx](https://github.com/LIHPC-Computational-Geometry/mgx) product.
+
+Its Spack and Cmake CIs are based on reusable workflows provided in [lihpccg-ci](https://github.com/LIHPC-Computational-Geometry/lihpccg-ci) project. 
diff --git a/cmake/version.cmake b/cmake/version.cmake
@@ -3,8 +3,8 @@
 #
 
 set (PREFERENCES_MAJOR_VERSION "6")
-set (PREFERENCES_MINOR_VERSION "2")
-set (PREFERENCES_RELEASE_VERSION "2")
+set (PREFERENCES_MINOR_VERSION "3")
+set (PREFERENCES_RELEASE_VERSION "0")
 set (PREFERENCES_VERSION ${PREFERENCES_MAJOR_VERSION}.${PREFERENCES_MINOR_VERSION}.${PREFERENCES_RELEASE_VERSION})
 
 
diff --git a/src/CfgEditor/CfgEdit.cpp b/src/CfgEditor/CfgEdit.cpp
@@ -2,11 +2,7 @@
 #include "PrefsXerces/XMLLoader.h"
 #include <TkUtil/Exception.h>
 
-#ifndef QT_5
-#include <QtGui/QApplication>
-#else	// QT_5
 #include <QApplication>
-#endif	// QT_5
 
 #include <iostream>
 #include <stdexcept>
diff --git a/src/CfgUpdater/CfgUpdate.cpp b/src/CfgUpdater/CfgUpdate.cpp
@@ -3,11 +3,7 @@
 #include <QtUtil/QtUnicodeHelper.h>
 #include <TkUtil/Exception.h>
 
-#ifndef QT_5
-#include <QtGui/QApplication>
-#else	// QT_5
 #include <QApplication>
-#endif	// QT_5
 
 #include <iostream>
 #include <stdexcept>
diff --git a/src/PrefsQt/CMakeLists.txt b/src/PrefsQt/CMakeLists.txt
@@ -5,10 +5,11 @@ find_package (GUIToolkitsVariables)
 
 include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
 include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/common_qt.cmake)	# QT_MAJOR
 include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake)
 
 find_package (QtUtil 6 REQUIRED)
-find_package(Qt5Core 5 NO_CMAKE_SYSTEM_PATH)	# In order to enable moc ...
+find_package(Qt${QT_MAJOR}Core ${QT_MAJOR} NO_CMAKE_SYSTEM_PATH)	# In order to enable moc ...
 
 file (GLOB HEADERS public/${CURRENT_PACKAGE_NAME}/*.h)
 file (GLOB CPP_SOURCES *.cpp)
diff --git a/src/PrefsQt/QtPreferencesDialog.cpp b/src/PrefsQt/QtPreferencesDialog.cpp
@@ -8,19 +8,11 @@
 
 #include <QFileInfo>
 #include <QCursor>
-#ifndef QT_5
-#include <QtGui/QLayout>
-#include <QtGui/QMessageBox>
-#include <QtGui/QFileDialog>
-#include <QtGui/QApplication>
-#include <QtGui/QLabel>
-#else	// QT_5
 #include <QLayout>
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QApplication>
 #include <QLabel>
-#endif	// QT_5
 #include <QtUtil/CharToLatinQString.h>
 
 #include <memory>
@@ -51,7 +43,11 @@ QtPreferencesDialog::QtPreferencesDialog (
 	setModal (modal);
 
 	QVBoxLayout*	layout	= new QVBoxLayout (this);
+#ifdef QT_5
 	layout->setMargin (10);
+#else	// => Qt6
+	layout->setContentsMargins (10, 10, 10, 10);
+#endif	// QT_5
 	layout->setSpacing (10);
 	layout->setSizeConstraint (QLayout::SetMinimumSize);
 	_menuBar	= createMenu (editable, withApply);
diff --git a/src/PrefsQt/QtPreferencesPanel.cpp b/src/PrefsQt/QtPreferencesPanel.cpp
@@ -14,17 +14,10 @@
 #include <QtUtil/QtMessageBox.h>
 
 #include <QCursor>
-#ifndef QT_5
-#include <QtGui/QApplication>
-#include <QtGui/QInputDialog>
-#include <QtGui/QMessageBox>
-#include <QtGui/QLineEdit>
-#else	// QT_5
 #include <QApplication>
 #include <QInputDialog>
 #include <QMessageBox>
 #include <QLineEdit>
-#endif	// QT_5
 
 #include <assert.h>
 #include <memory>
diff --git a/src/PrefsQt/public/PrefsQt/QtPreferencesDialog.h b/src/PrefsQt/public/PrefsQt/QtPreferencesDialog.h
@@ -4,17 +4,10 @@
 #include <PrefsCore/prefs_config.h>
 #include <PrefsQt/QtPreferencesPanel.h>
 
-#ifndef QT_5
-#include <QtGui/QDialog>
-#include <QtGui/QMenu>
-#include <QtGui/QMenuBar>
-#include <QtGui/QStatusBar>
-#else	// QT_5
 #include <QDialog>
 #include <QMenu>
 #include <QMenuBar>
 #include <QStatusBar>
-#endif	// QT_5
 
 #include <string>
 
diff --git a/src/PrefsQt/public/PrefsQt/QtPreferencesPanel.h b/src/PrefsQt/public/PrefsQt/QtPreferencesPanel.h
@@ -5,11 +5,7 @@
 #include <PrefsCore/Section.h>
 
 // MOC_SKIP_BEGIN
-#ifndef QT_5
-#include <QtGui/QTreeWidget>
-#else	// QT_5
 #include <QTreeWidget>
-#endif	// QT_5
 // MOC_SKIP_END
 
 #include <string>
diff --git a/src/PrefsQt/public/PrefsQt/QtPrefsListViewItem.h b/src/PrefsQt/public/PrefsQt/QtPrefsListViewItem.h
@@ -7,11 +7,7 @@
 #include <string>
 
 #include <QValidator>
-#ifndef QT_5
-#include <QtGui/QTreeWidget>
-#else	// QT_5
 #include <QTreeWidget>
-#endif	// QT_5
 
 
 class QtPrefsSectionListViewItem;
diff --git a/versions.txt b/versions.txt
@@ -1,3 +1,9 @@
+Version 6.3.0 : 13/12/23
+===============
+
+Portage Qt 6/GUIToolkitsVariables v 1.4.0/QtUtil v 6.4.0.
+
+
 Version 6.2.1 : 23/06/23
 ===============
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-cmake_minimum_required(VERSION 3.12)`
	`1`	`+cmake_minimum_required(VERSION 3.15)`
`2`	`2`
`3`	`3`	`project (Preferences CXX)`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`{`
`5`	`5`	`"name": "ci",`
`6`	`6`	`"cacheVariables": {`
`7`		`- "GUIToolkitsVariables_ROOT": "$env{INSTALL_DIR}/guitoolkitsvariables",`
`8`	`7`	`"TkUtil_ROOT": "$env{INSTALL_DIR}/tkutil",`
`9`	`8`	`"QtUtil_ROOT": "$env{INSTALL_DIR}/qtutil"`
`10`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`#`
`4`	`4`
`5`	`5`	`set (PREFERENCES_MAJOR_VERSION "6")`
`6`		`-set (PREFERENCES_MINOR_VERSION "2")`
`7`		`-set (PREFERENCES_RELEASE_VERSION "2")`
	`6`	`+set (PREFERENCES_MINOR_VERSION "3")`
	`7`	`+set (PREFERENCES_RELEASE_VERSION "0")`
`8`	`8`	`set (PREFERENCES_VERSION ${PREFERENCES_MAJOR_VERSION}.${PREFERENCES_MINOR_VERSION}.${PREFERENCES_RELEASE_VERSION})`
`9`	`9`
`10`	`10`