move to qt 5.15.15

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index 30d14ffc88336e00cc1a4cab682ea7ff21246254..5ddb96d197efbf6c6cdddbb339bffcbdbe6b95a6 100644 (file)
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -124,7 +124,7 @@ APPLICATION :
         pyreadline : '2.0'
         Python : '3.9.14'
         pytz : '2017.2'
-        qt : '5.15.2'
+        qt : '5.15.15'
         qwt : '6.1.6'
         requests : '2.31.0'
         rich : '13.7.1'

diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf
index cfb232893c9ceb6455b23b975394b1decc879131..6ebcf11dbf1b700e6ace5b70f86ad062ef336b44 100644 (file)
--- a/applications/SALOME-master-int32.pyconf
+++ b/applications/SALOME-master-int32.pyconf
@@ -123,7 +123,7 @@ APPLICATION :
         pyreadline : '2.0'
         Python : '3.9.14'
         pytz : '2017.2'
-        qt : '5.15.2'
+        qt : '5.15.15'
         qwt : '6.1.6'
         requests : '2.31.0'
         rich : '13.7.1'

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index e018142bb43cfc8adb571127c3f76bbc78e7f257..9634082e0be376ec76409e8fd8c084931f0e8311 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -236,7 +236,7 @@ __overwrite__ :
         'APPLICATION.products.cminpack'         : 'native'
         'APPLICATION.products.netcdf'           : '4.6.2'
         'APPLICATION.products.nlopt'            : '2.7.0'
-        'APPLICATION.products.qt'               : '5.15.2'
+        'APPLICATION.products.qt'               : '5.15.15'
         'APPLICATION.products.qwt'              : '6.1.6'
         'APPLICATION.products.poetry'           : {tag: '1.5.1', base: 'no', section: 'version_1_5_1_x86_64' }
         'APPLICATION.products.PyQt'             : '5.15.3'
@@ -296,7 +296,7 @@ __overwrite__ :
     }
     {
         # DB10:
-        #   - Qt minimal version 5.12
+        #   - Qt minimal version 5.15
         #   - xmlpatterns executable
         __condition__ : "VARS.dist in ['DB10']"
         'APPLICATION.rm_products'       : ['nose_py3','assimulo', 'irmb', 'mcut']
@@ -308,7 +308,7 @@ __overwrite__ :
         'APPLICATION.products.poetry_core' : '1.6.1'
         'APPLICATION.products.poetry'   : {tag: '1.5.1', base: 'no', section: 'version_1_5_1_x86_64' }
         'APPLICATION.products.PyFMI'    : {tag:'2.6',     base: 'no',  section: 'version_2_6_no_pip'                 }
-        'APPLICATION.products.qt'       : '5.15.2'
+        'APPLICATION.products.qt'       : '5.15.15'
         'APPLICATION.products.qwt'      : '6.1.6'
         'APPLICATION.products.PyQt'     : '5.15.3'
         'APPLICATION.products.sip'      : '5.5.0'
@@ -391,7 +391,7 @@ __overwrite__ :
          'APPLICATION.products.sip'              : '5.5.0'
          'APPLICATION.products.patsy'            : {tag: '0.5.4',   base: 'no', section: 'version_0_5_4_no_pip'              }
          'APPLICATION.products.root'             : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_CO9'               }
-         'APPLICATION.products.qt'               : {tag: '5.15.2',  base: 'no', section: 'version_5_15_2_CO9'                }
+         'APPLICATION.products.qt'               : {tag: '5.15.15', base: 'no', section: 'version_5_15_15_CO9'               }
          'APPLICATION.products.mdurl'            : {tag: '0.1.2',   base: 'no', section: 'version_0_1_2_no_pip'              }
          'APPLICATION.products.markdown_it_py'   : {tag: '3.0.0',   base: 'no', section: 'version_3_0_0_no_pip'              }
          'APPLICATION.products.rich'             : {tag: '13.7.1',  base: 'no', section: 'version_13_7_1_no_pip'             }
@@ -400,19 +400,19 @@ __overwrite__ :
          'APPLICATION.products.PyFMI'            : {tag: '2.6',     base: 'no', section: 'version_2_6_no_pip'                }
          'APPLICATION.products.numpydoc'         : {tag: '0.9.0',   base: 'no', section: 'version_0_9_0_no_pip'              }
          'APPLICATION.products.pandas'           : {tag: '1.1.5',   base: 'no', section: 'version_1_1_5_no_pip'              }
-         'APPLICATION.products.statsmodels'      : {tag: '0.14.1',   base: 'no', section: 'version_0_14_1_no_pip'              }
+         'APPLICATION.products.statsmodels'      : {tag: '0.14.1',  base: 'no', section: 'version_0_14_1_no_pip'             }
          'APPLICATION.products.nose'             : {tag: '1.3.7',   base: 'no', section: 'version_1_3_7_no_pip'              }
          'APPLICATION.products.ParaView'         : {tag: '5.11.0',  base: 'no', section: 'version_5_11_0_MPI_CO9', hpc: 'yes'}
          'APPLICATION.products.YDEFX'            : {tag: 'master',  base: 'no', section: 'version_master_CO9'                }
          'APPLICATION.products.YACS'             : {tag: 'master',  base: 'no', section: 'version_master_CO9'                }
-         'APPLICATION.products.poetry_core'      : {tag: '1.9.0',  base: 'no', section: 'version_1_9_0_x86_64' }
+         'APPLICATION.products.poetry_core'      : {tag: '1.9.0',   base: 'no', section: 'version_1_9_0_x86_64'              }
     }
     {
         __condition__ : "VARS.dist in ['FD32']"
         'APPLICATION.rm_products'               : ['nose_py3','assimulo'] #
         'APPLICATION.products.nlopt'            : '2.7.0'
         'APPLICATION.products.opencv'           : '3.2.0'
-        'APPLICATION.products.qt'               : '5.15.2'
+        'APPLICATION.products.qt'               : '5.15.15'
         'APPLICATION.products.qwt'              : '6.1.6'
         'APPLICATION.products.PyQt'             : '5.15.3'
         'APPLICATION.products.sip'              : '5.5.0'

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index a903d6066582862cfe8410cafa49de7eae0805c3..bee1e07846348d870f015df84d2d01db7786e14d 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -140,7 +140,7 @@ APPLICATION :
         pyreadline : '3.4.1'
         Python : '3.9.14'
         pytz : '2020.1'
-        qt : '5.15.2'
+        qt : '5.15.15'
         qtpy : {tag : '2.4.1', base : 'no', section : 'version_2_4_1_no_pip'}
         qwt : '6.1.6'
         requests : '2.22.0'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index e4f3ed7552e6bdd572414d6cc1a3f7d91128df2f..3168c3f505af6146894ec14372513d6fd37ae198 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -135,7 +135,7 @@ APPLICATION :
         pytest :  '8.1.1'
         Python : '3.9.14'
         pytz : '2017.2'
-        qt : '5.15.2'
+        qt : '5.15.15'
         qtpy : {tag : '2.4.1', base : 'no', section : 'version_2_4_1_no_pip', hpc: 'no'}
         qwt : '6.1.6'
         requests : '2.31.0'

diff --git a/products/qt.pyconf b/products/qt.pyconf
index fccede36d1a9e515ce81374ca4a5ccc17208cc83..5ecbfb44652ea13eee02972a606d43c5618f41df 100644 (file)
--- a/products/qt.pyconf
+++ b/products/qt.pyconf
@@ -38,6 +38,13 @@ version_5_15_15_win :
   opt_depend : ['openssl']
 }
 
+version_5_15_15_CO9 :
+{
+  compil_script : "qt-5.15.15" + $VARS.scriptExtension
+  depend : ["freetype", 'llvm']
+  patches: []
+}
+
 version_5_15_2 :
 {
   compil_script : "qt-5.15.2" + $VARS.scriptExtension