]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
spns #24300 overwrite qt native rpm package
authorSALOME support <support-salome@cea.fr>
Thu, 22 Jul 2021 12:17:08 +0000 (14:17 +0200)
committerSALOME support <support-salome@cea.fr>
Thu, 22 Jul 2021 12:17:08 +0000 (14:17 +0200)
applications/SALOME-master-native.pyconf
products/qt.pyconf

index 8a316b7c920aca0ddcc5fdb91792b29bb590041c..7f683bc580c7ebc68daf068fce44fe62277c45a7 100644 (file)
@@ -226,4 +226,11 @@ __overwrite__ :
       'PRODUCTS.sphinxintl.default.properties.pip' : "no"
       'APPLICATION.products.cmake' : '3.12.1'
    }
+   {
+      # FD 34 qt5 package is qt5-qtbase-devel.
+      
+      __condition__ : "VARS.dist in ['FD34']"
+      'PRODUCTS.qt.default.system_info.rpm' : []
+      'PRODUCTS.qt.default.system_info.rpm_dev' : ["qt5-qtbase-devel"]
+   }
 ]
index c0fe66902dddc06a06d0295f9afe2c9510f5eb66..2d9eb44ac66e3fca9e777b55379a371e10ae5ad1 100644 (file)
@@ -7,7 +7,7 @@ default:
     system_info : 
     {
         rpm : []
-        rpm_dev : ["qt5-qtbase-devel"]
+        rpm_dev : ["qt5-devel"]
         apt : []
         apt_dev : ["qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools"]
     }