From 2d4622867fc23b203254dadf6d772520a8db2e58 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 27 Jun 2007 11:14:59 +0000 Subject: [PATCH] Porting to qt 4: merge changes from GUI module --- salome_adm/unix/config_files/check_qt.m4 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/salome_adm/unix/config_files/check_qt.m4 b/salome_adm/unix/config_files/check_qt.m4 index d0a5eee51..61cd1895c 100644 --- a/salome_adm/unix/config_files/check_qt.m4 +++ b/salome_adm/unix/config_files/check_qt.m4 @@ -68,8 +68,8 @@ then then AC_MSG_CHECKING(whether Qt version >= 4.0) QT_VERSION=`grep "QT_VERSION_STR" ${QTDIR}/include${QTINC}/QtCore/qglobal.h | sed -e 's%^#define QT_VERSION_STR[[:space:]]*\"\([[:digit:]\.]*\)\"%\1%g'` - QT_VERSION_NUM=`echo $QT_VERSION | awk -F. '{maj=1;min=2;rel=3;v=$maj*10000+$min*100+$rel;print v}'` - if test $QT_VERSION_NUM -ge 40000 + QT_VERSION_ID=`echo $QT_VERSION | awk -F. '{v=$[1]*10000+$[2]*100+$[3];print v}'` + if test $QT_VERSION_ID -ge 40000 then AC_MSG_RESULT(yes) else @@ -297,6 +297,7 @@ AC_SUBST(QT_OTHER_LIBS) AC_SUBST(QT_LIBS) AC_SUBST(QT_MT_LIBS) AC_SUBST(QT_VERSION) +AC_SUBST(QT_VERSION_ID) AC_LANG_RESTORE -- 2.39.2