Skip to content

Commit 525b7cf

Browse files
author
Charles PIGNEROL
committed
Version 6.4.7. Removed support for python 2.
1 parent a0b46fb commit 525b7cf

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed

cmake/version.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
# version.cmake : version du projet
33
#
44

5-
# Pour la bibliothèque QtPython :
6-
set (QT_PYTHON_MAJOR_VERSION "6")
7-
set (QT_PYTHON_MINOR_VERSION "4")
8-
set (QT_PYTHON_RELEASE_VERSION "6")
9-
set (QT_PYTHON_VERSION ${QT_PYTHON_MAJOR_VERSION}.${QT_PYTHON_MINOR_VERSION}.${QT_PYTHON_RELEASE_VERSION})
5+
# Pour la bibliothèque QtPython (obsolète, Python 2) :
6+
#set (QT_PYTHON_MAJOR_VERSION "6")
7+
#set (QT_PYTHON_MINOR_VERSION "4")
8+
#set (QT_PYTHON_RELEASE_VERSION "7")
9+
#set (QT_PYTHON_VERSION ${QT_PYTHON_MAJOR_VERSION}.${QT_PYTHON_MINOR_VERSION}.${QT_PYTHON_RELEASE_VERSION})
1010

1111
# Pour la bibliothèque QtPython3 :
1212
set (QT_PYTHON_3_MAJOR_VERSION "6")
1313
set (QT_PYTHON_3_MINOR_VERSION "4")
14-
set (QT_PYTHON_3_RELEASE_VERSION "6")
14+
set (QT_PYTHON_3_RELEASE_VERSION "7")
1515
set (QT_PYTHON_3_VERSION ${QT_PYTHON_3_MAJOR_VERSION}.${QT_PYTHON_3_MINOR_VERSION}.${QT_PYTHON_3_RELEASE_VERSION})
1616

src/CMakeLists.txt

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
if (USE_PYTHON_2)
2-
add_subdirectory (QtPython)
3-
if (BUILD_PY_CONSOLE)
4-
add_subdirectory (QtPyConsole) # Bloque sur la partie moc en de rares circonstances
5-
endif (BUILD_PY_CONSOLE)
6-
else ( )
7-
add_subdirectory (QtPython3)
8-
if (BUILD_PY_CONSOLE)
9-
add_subdirectory (QtPyConsole3) # Bloque sur la partie moc en de rares circonstances
10-
endif (BUILD_PY_CONSOLE)
11-
endif (USE_PYTHON_3)
1+
#add_subdirectory (QtPython) # Obsolète, python 2
2+
#add_subdirectory (QtPyConsole) # Obsolète, python 2. Bloque sur la partie moc en de rares circonstances
3+
add_subdirectory (QtPython3)
4+
if (BUILD_PY_CONSOLE)
5+
add_subdirectory (QtPyConsole3) # Bloque sur la partie moc en de rares circonstances
6+
endif (BUILD_PY_CONSOLE)
127

versions.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Version 6.4.7 : 06/12/24
2+
===============
3+
4+
Arrêt support python 2.
5+
6+
17
Version 6.4.6 : 29/11/24
28
===============
39

0 commit comments

Comments
 (0)