Add support for Qt/Mac 4.2. QtDesigner and QtTest are frameworks in 4…

….2 but libraries in prior Qt versions. git-svn-id: http://svn.osgeo.org/qgis/trunk@5760 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Sep 5, 2006 · 8d4a472 · 8d4a472
1 parent 47e6b9f
commit 8d4a472
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/acinclude.m4 b/acinclude.m4
@@ -180,7 +180,8 @@ AC_MSG_CHECKING([Qt version in $QTVERTEST])
 QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTVERTEST/qglobal.h | perl -p -e 's/\D//g'`
 case "${QT_VER}" in
   41*|42*)
-    QT_MAJOR="4"
+    QT_MAJOR="${QT_VER:0:1}"
+    QT_MINOR="${QT_VER:1:1}"
     case "${host}" in
     *-darwin*)
       QT4_3SUPPORTINC=$QTDIR/lib/Qt3Support.framework/Headers
@@ -191,8 +192,13 @@ case "${QT_VER}" in
       QT4_SQLINC=$QTDIR/lib/QtSql.framework/Headers
       QT4_XMLINC=$QTDIR/lib/QtXml.framework/Headers
       QT4_SVGINC=$QTDIR/lib/QtSvg.framework/Headers
-      QT4_TESTINC=$QTDIR/include/QtTest
-      QT4_DESIGNERINC=$QTDIR/include/QtDesigner
+      if test $QT_MINOR -lt "2"; then
+        QT4_TESTINC=$QTDIR/include/QtTest
+        QT4_DESIGNERINC=$QTDIR/include/QtDesigner
+      else
+        QT4_TESTINC=$QTDIR/lib/QtTest.framework/Headers
+        QT4_DESIGNERINC=$QTDIR/lib/QtDesigner.framework/Headers
+      fi
 	  ;;
     *)
       QT4_3SUPPORTINC=$QTINC/Qt3Support
@@ -335,7 +341,12 @@ case "${host}" in
       QT_IS_MT="yes"
       QT_IS_EMBEDDED="yes"
     elif test "x`ls $QTDIR/lib/QtCore.framework/QtCore 2> /dev/null`" != x ; then
-      QT_LIB="-Xlinker -F$QTDIR/lib -framework Qt3Support -framework QtCore -framework QtGui -framework QtNetwork -framework QtXml -framework QtSvg -L$QTDIR/lib -lQtDesigner -lQtTest"
+      QT_LIB="-Xlinker -F$QTDIR/lib -framework Qt3Support -framework QtCore -framework QtGui -framework QtNetwork -framework QtXml -framework QtSvg"
+      if test $QT_MINOR -lt "2"; then
+        QT_LIB="$QT_LIB -L$QTDIR/lib -lQtDesigner -lQtTest"
+      else
+        QT_LIB="$QT_LIB -framework QtDesigner -framework QtTest"
+      fi
       QT_CXXFLAGS="-DQT3_SUPPORT -I$QT4_DEFAULTINC -I$QT4_3SUPPORTINC -I$QT4_COREINC -I$QT4_GUIINC -I$QT4_NETWORKINC -I$QT4_OPENGLINC -I$QT4_SQLINC -I$QT4_SVGINC -I$QT4_XMLINC -I$QT4_DESIGNERINC -I$QT4_TESTINC -I$QTDIR/include"
       QT_IS_MT="yes"
     fi