From 694998934f7e36a761600ab6e3f5cfa246441fc0 Mon Sep 17 00:00:00 2001
From: paulc <paulc@acf43c95-373e-0410-b603-e72c3f656dc1>
Date: Tue, 8 Jan 2008 14:43:34 +0000
Subject: [PATCH] Detect Qt version and conditionally compile based on it.

git-svn-id: http://yate.null.ro/svn/yate/trunk@1602 acf43c95-373e-0410-b603-e72c3f656dc1
---
 clients/qt4/Makefile.in   | 4 ++++
 clients/qt4/qt4client.cpp | 6 +++++-
 configure.in              | 8 ++++++--
 windows/yateversn.h       | 1 +
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/clients/qt4/Makefile.in b/clients/qt4/Makefile.in
index f435e806..61da0e20 100644
--- a/clients/qt4/Makefile.in
+++ b/clients/qt4/Makefile.in
@@ -20,6 +20,10 @@ OBJECTS = $(SOURCES:.cpp=.o) qt4client.moc.o
 
 COMPILE = $(CXX) $(DEFS) $(DEBUG) $(INCLUDES) $(CXXFLAGS)
 
+ifneq (x@QT4_VER@,x)
+DEFS := $(DEFS) -DQT4_VER=@QT4_VER@
+endif
+
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
diff --git a/clients/qt4/qt4client.cpp b/clients/qt4/qt4client.cpp
index b87b0e96..153b3b94 100644
--- a/clients/qt4/qt4client.cpp
+++ b/clients/qt4/qt4client.cpp
@@ -938,7 +938,11 @@ void QtWindow::populate()
 
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setSpacing(0);
-    //layout->setContentsMargins(0,0,0,0);
+#if defined(QT4_VER) && (QT4_VER < 040300)
+    layout->setMargin(0);
+#else
+    layout->setContentsMargins(0,0,0,0);
+#endif
     layout->addWidget(formWidget);
     setLayout(layout);
     setWindowTitle(formWidget->windowTitle());
diff --git a/configure.in b/configure.in
index adea3185..578f123d 100644
--- a/configure.in
+++ b/configure.in
@@ -18,6 +18,9 @@ AC_SUBST(PACKAGE_VERSION_RELEASE)
 AC_SUBST(PACKAGE_RELEASE)
 AC_SUBST(PACKAGE_STATUS)
 
+# sed expression to convert version into something comparable lexicographically
+vsed='s/\(^\|\.\)\([[0-9]]\)\($\|\.\)/\10\2\3/g'
+
 # We may need the host OS type but avoid the overhead of AC_CANONICAL_SYSTEM
 AC_MSG_CHECKING([for local operating system type])
 uname_os=`uname -s`
@@ -544,8 +547,6 @@ prtti=`$ac_cv_use_pwlib/bin/ptlib-config --ccflags 2>/dev/null | sed -n 's/^.*\(
 incpw="$ac_cv_use_pwlib/include/ptlib.h"
 libpw="$ac_cv_use_pwlib/$ARCHLIB/libpt.so"
 PWLIB_INC="-I$ac_cv_use_pwlib/include/ptlib"
-# convert version into something comparable lexicographically
-vsed='s/\(^\|\.\)\([[0-9]]\)\($\|\.\)/\10\2\3/g'
 vpw=`echo "$verpw" | sed "$vsed" | sed "$vsed"`
 if [[ "$vpw" '<' "01.06.00" ]]; then
     PWLIB_INC="$PWLIB_INC/unix/ptlib $PWLIB_INC/unix $PWLIB_INC"
@@ -679,6 +680,7 @@ AC_SUBST(GMOZ_LIB)
 HAVE_QT4=no
 QT4_INC=""
 QT4_LIB=""
+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 using pkg-config])
@@ -689,6 +691,7 @@ if [[ "x$ac_cv_use_libqt4" = "xyes" ]]; then
 	HAVE_QT4=yes
 	QT4_INC="$incqt"
 	QT4_LIB="$libqt"
+	QT4_VER=`echo "$verqt" | sed "$vsed" | sed "$vsed" | sed 's/\(..\)\.\(..\)\.\(..\)/\1\2\3/'`
 	ac_cv_use_libqt="no"
     else
 	verqt="no"
@@ -698,6 +701,7 @@ fi
 AC_SUBST(HAVE_QT4)
 AC_SUBST(QT4_INC)
 AC_SUBST(QT4_LIB)
+AC_SUBST(QT4_VER)
 
 AC_ARG_WITH(libgtk2,AC_HELP_STRING([--with-libgtk2],[use Gtk for graphical clients (default)]),[ac_cv_use_libgtk2=$withval],[ac_cv_use_libgtk2=yes])
 HAVE_COREDUMPER=no
diff --git a/windows/yateversn.h b/windows/yateversn.h
index 19f0ea9b..cc8515ff 100644
--- a/windows/yateversn.h
+++ b/windows/yateversn.h
@@ -20,6 +20,7 @@
 #define YATE_BUILD_S "0"
 #define YATE_VERSION "2.0.0"
 #define YATE_RELEASE "1"
+#define YATE_STATUS  "alpha"
 
 /* Windows version resource - file and string style */
 #define YATE_WINVER_F 2,0,0,1