merge from master

[tools/sat_salome.git] / products / qt.pyconf

diff --git a/products/qt.pyconf b/products/qt.pyconf
index 2ec66763f4a4b0735885b165289ead110c9ff885..dccf7f2ec949bccbcd5d54aeab73d1d93126a291 100644 (file)
--- a/products/qt.pyconf
+++ b/products/qt.pyconf
@@ -4,13 +4,6 @@ default:
     build_source : "script"
     compil_script : $name + $VARS.scriptExtension
     get_source : "archive"
-    system_info : 
-    {
-        rpm : []
-        rpm_dev : ["qt5-devel"]
-        apt : []
-        apt_dev : ["qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools"]
-    }
     environ :
     {
        env_script : $name + ".py"
@@ -34,21 +27,52 @@ default_win:
 
 version_5_15_2 :
 {
-  compil_script : "qt-5.15.2.sh"
+  compil_script : "qt-5.15.2" + $VARS.scriptExtension
   depend : ["freetype", 'llvm']
 }
 
+version_5_15_2_win :
+{
+  depend : ["freetype"]
+  build_depend : ["llvm"]
+}
+
 version_5_12_10 :
 {
-  compil_script : "qt-5.12.10.sh"
+  compil_script : "qt-5.12.10" + $VARS.scriptExtension
   depend : ["freetype", 'llvm']
+  patches : ['qt-mapbox-FD32-gcc-10.0.patch']
+}
+
+version_5_12_10_win :
+{
+  depend : ["freetype"]
+  build_depend : ["llvm"]
+  patches : []
 }
 
 version_5_9_1 :
 {
+  compil_script :  "qt-5.9.1.sh"
   patches : []
 }
 
+version_5_9_1_FD32 :
+{
+  compil_script :  "qt-5.9.1.sh"
+  patches : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch',
+             'qt-5.9.1-mapbox-FD32.patch'
+           ]
+}
+
+version_5_9_1_UB20_04 :
+{
+  compil_script :  "qt-5.9.1.sh"
+  patches : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch',
+            'qt_mysql_UB20.patch'
+            ]
+}
+
 version_5_6_1_1:
 {
     compil_script : "qt-5.6.1" + $VARS.scriptExtension
@@ -59,7 +83,7 @@ version_5_5_1:
 {
     compil_script :  "qt-5.5.1.sh"
     patches : [
-                  "qt-5.5.1-qlockfile.patch"
+                  "qt-5.5.1-qlockfile.patch",
                   "qt_5.5.1-qwebengine.patch"
               ]
     depend : []