Skip to content

Commit 8d4a472

Browse files
author
telwertowski
committed
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
1 parent 47e6b9f commit 8d4a472

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

acinclude.m4

+15-4
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,8 @@ AC_MSG_CHECKING([Qt version in $QTVERTEST])
180180
QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTVERTEST/qglobal.h | perl -p -e 's/\D//g'`
181181
case "${QT_VER}" in
182182
41*|42*)
183-
QT_MAJOR="4"
183+
QT_MAJOR="${QT_VER:0:1}"
184+
QT_MINOR="${QT_VER:1:1}"
184185
case "${host}" in
185186
*-darwin*)
186187
QT4_3SUPPORTINC=$QTDIR/lib/Qt3Support.framework/Headers
@@ -191,8 +192,13 @@ case "${QT_VER}" in
191192
QT4_SQLINC=$QTDIR/lib/QtSql.framework/Headers
192193
QT4_XMLINC=$QTDIR/lib/QtXml.framework/Headers
193194
QT4_SVGINC=$QTDIR/lib/QtSvg.framework/Headers
194-
QT4_TESTINC=$QTDIR/include/QtTest
195-
QT4_DESIGNERINC=$QTDIR/include/QtDesigner
195+
if test $QT_MINOR -lt "2"; then
196+
QT4_TESTINC=$QTDIR/include/QtTest
197+
QT4_DESIGNERINC=$QTDIR/include/QtDesigner
198+
else
199+
QT4_TESTINC=$QTDIR/lib/QtTest.framework/Headers
200+
QT4_DESIGNERINC=$QTDIR/lib/QtDesigner.framework/Headers
201+
fi
196202
;;
197203
*)
198204
QT4_3SUPPORTINC=$QTINC/Qt3Support
@@ -335,7 +341,12 @@ case "${host}" in
335341
QT_IS_MT="yes"
336342
QT_IS_EMBEDDED="yes"
337343
elif test "x`ls $QTDIR/lib/QtCore.framework/QtCore 2> /dev/null`" != x ; then
338-
QT_LIB="-Xlinker -F$QTDIR/lib -framework Qt3Support -framework QtCore -framework QtGui -framework QtNetwork -framework QtXml -framework QtSvg -L$QTDIR/lib -lQtDesigner -lQtTest"
344+
QT_LIB="-Xlinker -F$QTDIR/lib -framework Qt3Support -framework QtCore -framework QtGui -framework QtNetwork -framework QtXml -framework QtSvg"
345+
if test $QT_MINOR -lt "2"; then
346+
QT_LIB="$QT_LIB -L$QTDIR/lib -lQtDesigner -lQtTest"
347+
else
348+
QT_LIB="$QT_LIB -framework QtDesigner -framework QtTest"
349+
fi
339350
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"
340351
QT_IS_MT="yes"
341352
fi

0 commit comments

Comments
 (0)