From: imn <imn@opencascade.com>
Date: Fri, 20 Nov 2015 18:28:23 +0000 (+0300)
Subject: Correction check QT_VERSION in macros
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b18868974913ea96dd97568af76a9b91bbcf6047;p=modules%2Fgui.git

Correction check QT_VERSION in macros
---

diff --git a/adm_local/cmake_files/UseQtExt.cmake b/adm_local/cmake_files/UseQtExt.cmake
index 9c3f5103c..626e66aa8 100644
--- a/adm_local/cmake_files/UseQtExt.cmake
+++ b/adm_local/cmake_files/UseQtExt.cmake
@@ -40,7 +40,7 @@ MACRO(QT_INSTALL_TS_RESOURCES MYTSFILES WHERETOINSTALL)
 ENDMACRO(QT_INSTALL_TS_RESOURCES)
 
 MACRO(QT_WRAP_MOC)
-IF (NOT SALOME_BUILD_WITH_QT5)
+IF (QT_VERSION VERSION_LESS "5.0")
   QT4_WRAP_CPP(${ARGN})
 ELSE()
   QT5_WRAP_CPP(${ARGN})
@@ -48,7 +48,7 @@ ENDIF()
 ENDMACRO(QT_WRAP_MOC)
 
 MACRO(QT_WRAP_UIC)
-IF (NOT SALOME_BUILD_WITH_QT5)
+IF (QT_VERSION VERSION_LESS "5.0")
   QT4_WRAP_UI(${ARGN})
 ELSE()
   QT5_WRAP_UI(${ARGN})
@@ -56,7 +56,7 @@ ENDIF()
 ENDMACRO(QT_WRAP_UIC)
 
 MACRO(QT_ADD_RESOURCES)
-IF (NOT SALOME_BUILD_WITH_QT5)
+IF (QT_VERSION VERSION_LESS "5.0")
   QT4_ADD_RESOURCES(${ARGN})
 ELSE()
   QT5_ADD_RESOURCES(${ARGN})