From c3cc48188113afd464f0ce97701de0cd780efd91 Mon Sep 17 00:00:00 2001 From: Charles PIGNEROL Date: Wed, 18 Nov 2026 10:01:14 +0100 Subject: [PATCH] Version 6.5.1. Qt dependency fix. Method QtPython::getNamedVersion ( ). --- cmake/version.cmake | 2 +- src/QtPyConsole/CMakeLists.txt | 2 +- src/QtPyConsole3/CMakeLists.txt | 2 +- src/QtPython/CMakeLists.txt | 2 +- src/QtPython3/CMakeLists.txt | 2 +- src/QtPython3/QtPython.cpp | 6 ++++++ src/QtPython3/public/QtPython3/QtPython.h | 5 +++++ versions.txt | 9 +++++++++ 8 files changed, 25 insertions(+), 5 deletions(-) diff --git a/cmake/version.cmake b/cmake/version.cmake index 0fae46d..a2ef138 100644 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -5,7 +5,7 @@ # Pour la bibliothèque QtPython3 : set (QT_PYTHON_3_MAJOR_VERSION "6") set (QT_PYTHON_3_MINOR_VERSION "5") -set (QT_PYTHON_3_RELEASE_VERSION "0") +set (QT_PYTHON_3_RELEASE_VERSION "1") set (QT_PYTHON_3_VERSION ${QT_PYTHON_3_MAJOR_VERSION}.${QT_PYTHON_3_MINOR_VERSION}.${QT_PYTHON_3_RELEASE_VERSION}) # Pour la bibliothèque QtPython (obsolète, Python 2) : diff --git a/src/QtPyConsole/CMakeLists.txt b/src/QtPyConsole/CMakeLists.txt index b193dd1..828983b 100644 --- a/src/QtPyConsole/CMakeLists.txt +++ b/src/QtPyConsole/CMakeLists.txt @@ -5,7 +5,7 @@ find_package (GUIToolkitsVariables) include (${CMAKE_SOURCE_DIR}/cmake/version.cmake) include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake) include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake) -find_package(Qt5Core NO_CMAKE_SYSTEM_PATH) +find_package(Qt5Core NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PACKAGE_REGISTRY) add_executable (PyConsole QtPythonInterpretorMainWindow.cpp QtPythonInterpretorMainWindow.h python_console.cpp) set_property (TARGET PyConsole PROPERTY AUTOMOC ON) diff --git a/src/QtPyConsole3/CMakeLists.txt b/src/QtPyConsole3/CMakeLists.txt index 693cacc..911fee0 100644 --- a/src/QtPyConsole3/CMakeLists.txt +++ b/src/QtPyConsole3/CMakeLists.txt @@ -6,7 +6,7 @@ include (${CMAKE_SOURCE_DIR}/cmake/version.cmake) include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake) include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake) -find_package(Qt5Core NO_CMAKE_SYSTEM_PATH) +find_package(Qt5Core NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PACKAGE_REGISTRY) add_executable (PyConsole3 QtPython3InterpretorMainWindow.cpp QtPython3InterpretorMainWindow.h python_console3.cpp) set_property (TARGET PyConsole3 PROPERTY AUTOMOC ON) diff --git a/src/QtPython/CMakeLists.txt b/src/QtPython/CMakeLists.txt index 451c13b..f8eeb4b 100644 --- a/src/QtPython/CMakeLists.txt +++ b/src/QtPython/CMakeLists.txt @@ -14,7 +14,7 @@ set (QT_PYTHON_SCRIPTS_DIR "${CMAKE_INSTALL_PREFIX}/${PYTHON_BINDING_DIR}") find_package (QtUtil 6 REQUIRED) find_package (PythonUtil 6 REQUIRED) -find_package(Qt5Core NO_CMAKE_SYSTEM_PATH) # In order to enable moc ... +find_package(Qt5Core NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PACKAGE_REGISTRY) # In order to enable moc ... file (GLOB HEADERS public/${CURRENT_PACKAGE_NAME}/*.h) file (GLOB CPP_SOURCES *.cpp *.qrc) diff --git a/src/QtPython3/CMakeLists.txt b/src/QtPython3/CMakeLists.txt index bce855f..b4a79cf 100644 --- a/src/QtPython3/CMakeLists.txt +++ b/src/QtPython3/CMakeLists.txt @@ -15,7 +15,7 @@ set (QT_PYTHON_SCRIPTS_DIR "${CMAKE_INSTALL_PREFIX}/${PYTHON_BINDING_DIR}") find_package (QtUtil 6 REQUIRED) find_package (PythonUtil 6 REQUIRED) -find_package(Qt${QT_MAJOR}Core NO_CMAKE_SYSTEM_PATH) # In order to enable moc ... +find_package(Qt${QT_MAJOR}Core NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PACKAGE_REGISTRY) # In order to enable moc ... file (GLOB HEADERS public/${CURRENT_PACKAGE_NAME}/*.h) file (GLOB CPP_SOURCES *.cpp *.qrc) diff --git a/src/QtPython3/QtPython.cpp b/src/QtPython3/QtPython.cpp index 4a47a32..f7e3fa2 100644 --- a/src/QtPython3/QtPython.cpp +++ b/src/QtPython3/QtPython.cpp @@ -228,6 +228,12 @@ const Version& QtPython::getVersion ( ) } // QtPython::getVersion +UTF8String QtPython::getNamedVersion ( ) +{ + return UTF8String (_version.getVersion ( ) + " (console v1)", _consoleCharset); +} // QtPython::getNamedVersion + + const Charset& QtPython::getConsoleCharset ( ) // v 3.3.0 { return _consoleCharset; diff --git a/src/QtPython3/public/QtPython3/QtPython.h b/src/QtPython3/public/QtPython3/QtPython.h index fd124a6..87a1a59 100644 --- a/src/QtPython3/public/QtPython3/QtPython.h +++ b/src/QtPython3/public/QtPython3/QtPython.h @@ -43,6 +43,11 @@ class QtPython */ static const TkUtil::Version& getVersion ( ); + /** + * @return Le numéro de version de ce composant logiciel suffixé de la version de la console. + */ + static TkUtil::UTF8String getNamedVersion ( ); + /** * @return Le jeu de caractères utilisé par la console de lancement. */ diff --git a/versions.txt b/versions.txt index 19d479b..6d487c2 100644 --- a/versions.txt +++ b/versions.txt @@ -1,3 +1,12 @@ +Version 6.5.1 : 18/11/26 +=============== + +Fichiers cmake : remplacement de NO_CMAKE_SYSTEM_PATH par NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PACKAGE_REGISTRY +pour Qt (id. GUIToolkitsVariables/cmake/common_qt.cmake). + +Fonction QtPython::getNamedVersion ( ). + + Version 6.5.0 : 28/08/26 ===============