Skip to content

Commit 816f2e9

Browse files
author
telwertowski
committed
Fix Mac references to QtDesigner and QtTest; these are libraries and not frameworks. (Note: the line beginning "dependency_libs=" in $QTDIR/lib/libQtTest.la must also be disabled to avoid a Mac glibtool bug.)
git-svn-id: http://svn.osgeo.org/qgis/trunk@5225 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 1b77802 commit 816f2e9

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

acinclude.m4

+4-5
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ case "${QT_VER}" in
191191
QT4_SQLINC=$QTDIR/lib/QtSql.framework/Headers
192192
QT4_XMLINC=$QTDIR/lib/QtXml.framework/Headers
193193
QT4_SVGINC=$QTDIR/lib/QtSvg.framework/Headers
194-
QT4_TESINC=$QTDIR/lib/QtTest.framework/Headers
195-
QT4_DESIGNERINC=$QTDIR/lib/QtDesigner.framework/Headers
194+
QT4_TESTINC=$QTDIR/include/QtTest
195+
QT4_DESIGNERINC=$QTDIR/include/QtDesigner
196196
;;
197197
*)
198198
QT4_3SUPPORTINC=$QTINC/Qt3Support
@@ -207,7 +207,6 @@ case "${QT_VER}" in
207207
QT4_DESIGNERINC=$QTINC/QtDesigner
208208
;;
209209
esac
210-
QT4_DESIGNERINC=$QTINC/QtDesigner
211210
QT4_DEFAULTINC=$QTDIR/mkspecs/default
212211
;;
213212
*)
@@ -336,8 +335,8 @@ case "${host}" in
336335
QT_IS_MT="yes"
337336
QT_IS_EMBEDDED="yes"
338337
elif test "x`ls $QTDIR/lib/QtCore.framework/QtCore 2> /dev/null`" != x ; then
339-
QT_LIB="-Xlinker -F$QTDIR/lib -framework QtCore -framework Qt3Support -framework QtGui -framework QtNetwork -framework QtXml -framework QtSvg"
340-
QT_CXXFLAGS="-DQT3_SUPPORT -F$QTDIR/lib -I$QT4_DEFAULTINC -I$QT4_3SUPPORTINC -I$QT4_COREINC -I$QT4_DESIGNERINC -I$QT4_GUIINC -I$QT4_NETWORKINC -I$QT4_OPENGLINC -I$QT4_SQLINC -I$QT4_XMLINC -I$QT4_SVGINC -I$QT4_TESTINC -I$QT4_DESIGNERINC"
338+
QT_LIB="-Xlinker -F$QTDIR/lib -framework Qt3Support -framework QtCore -framework QtGui -framework QtNetwork -framework QtXml -framework QtSvg -L$QTDIR/lib -lQtDesigner -lQtTest"
339+
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"
341340
QT_IS_MT="yes"
342341
fi
343342
;;

0 commit comments

Comments
 (0)