retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Qt version >= 4.3.0 is now required. 

Fixed Qt (non)detection by some versions of qmake.


git-svn-id: http://voip.null.ro/svn/yate@3197 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2010-04-15 10:42:59 +00:00
parent 9d4ac6fac2
commit 1134952a14
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clients/qt4/qt4client.cpp
View File

@ -1161,12 +1161,8 @@ bool QtWindow::setUrgent(const String& name, bool urgent)
name.c_str(),String::boolText(urgent),this);
if (name == m_id) {
#if QT_VERSION >= 0x040300
QApplication::alert(this,0);
return true;
#else
return false;
#endif
}
QtWidget w(this,name);

12
configure.in
View File

@ -993,7 +993,7 @@ QT4_MOC=""
QT4_VER=""
AC_ARG_WITH(libqt4,AC_HELP_STRING([--with-libqt4],[use Qt for graphical clients (default)]),[ac_cv_use_libqt4=$withval],[ac_cv_use_libqt4=yes])
if [[ "x$ac_cv_use_libqt4" = "xyes" ]]; then
AC_MSG_CHECKING([for Qt4 >= 4.2.0 using pkg-config])
AC_MSG_CHECKING([for Qt4 >= 4.3.0 using pkg-config])
pkgd="/usr/lib/qt4/$ARCHLIB/pkgconfig"
verqt=`pkg-config --modversion QtCore 2>/dev/null`
if [[ -z "$verqt" -a -d "$pkgd" ]]; then
@ -1013,7 +1013,7 @@ if [[ "x$ac_cv_use_libqt4" = "xyes" ]]; then
test -z "$QT4_MOC" && QT4_MOC="moc"
QT4_VER=`echo "$verqt" | $csed "$vsed" | $csed "$vsed" | sed 's/\(..\)\.\(..\)\.\(..\)/\1\2\3/'`
ac_cv_use_libqt="no"
if [[ 1$QT4_VER -lt 1040200 ]]; then
if [[ 1$QT4_VER -lt 1040300 ]]; then
HAVE_QT4=no
verqt="too old ($verqt)"
fi
@ -1024,9 +1024,13 @@ if [[ "x$ac_cv_use_libqt4" = "xyes" ]]; then
AC_MSG_RESULT([$verqt])
if [[ "x$HAVE_QT4" = "xno" ]]; then
AC_MSG_CHECKING([or Qt4 >= 4.2.0 using qmake])
AC_MSG_CHECKING([or Qt4 >= 4.3.0 using qmake])
incqt=`qmake -query QT_INSTALL_HEADERS 2>/dev/null`
libqt=`qmake -query QT_INSTALL_LIBS 2>/dev/null`
if [[ "x$incqt" = "x**Unknown**" -o "x$libqt" = "x**Unknown**" ]]; then
incqt=""
libqt=""
fi
if [[ "x$incqt" != "x" -a "x$libqt" != "x" ]]; then
HAVE_QT4=yes
QT4_INC="-I$incqt -I$incqt/QtUiTools -I$incqt/QtGui -I$incqt/QtXml -I$incqt/QtCore"
@ -1050,7 +1054,7 @@ if [[ "x$ac_cv_use_libqt4" = "xyes" ]]; then
QT4_MOC="$QT4_MOC/moc"
verqt=`qmake -query QT_VERSION 2>/dev/null`
QT4_VER=`echo "$verqt" | $csed "$vsed" | $csed "$vsed" | sed 's/\(..\)\.\(..\)\.\(..\)/\1\2\3/'`
if [[ 1$QT4_VER -lt 1040200 ]]; then
if [[ 1$QT4_VER -lt 1040300 ]]; then
HAVE_QT4=no
verqt="too old ($verqt)"
fi