Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/version.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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) :
Expand Down
2 changes: 1 addition & 1 deletion src/QtPyConsole/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/QtPyConsole3/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/QtPython/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/QtPython3/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions src/QtPython3/QtPython.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions src/QtPython3/public/QtPython3/QtPython.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
9 changes: 9 additions & 0 deletions versions.txt
Original file line number Diff line number Diff line change
@@ -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
===============

Expand Down
Loading