sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Quick change to fail configure if Qt 4 is not found. Additional cleanup

Browse Source 
to the Qt detection code is required to complete the migration from
version 3.x to 4.x.


git-svn-id: http://svn.osgeo.org/qgis/trunk@4267 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
gsherman 2005-11-25 17:53:29 +00:00
parent cbd6248652
commit d5fb0e2e98
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
acinclude.m4
View File

@ -111,9 +111,9 @@ AC_SUBST(GEOS_LDADD)
])
dnl ------------------------------------------------------------------------
dnl Detect QT3
dnl Detect QT
dnl
dnl use AQ_CHECK_QT to detect QT3
dnl use AQ_CHECK_QT to detect QT
dnl it sets:
dnl QT_CXXFLAGS
dnl QT_LDADD
@ -200,9 +200,9 @@ case "${QT_VER}" in
QT4_DESIGNERINC=$QTDIR/include/QtDesigner
QT4_DEFAULTINC=$QTDIR/mkspecs/default
;;
33*)
QT_MAJOR="3"
;;
# 33*)
# QT_MAJOR="3"
# ;;
# 32*)
# QT_MAJOR="3"
# ;;
@ -210,7 +210,7 @@ case "${QT_VER}" in
# QT_MAJOR="3"
# ;;
*)
AC_MSG_ERROR([*** Qt version 3.3.x or higher is required])
AC_MSG_ERROR([*** Qt version 4.0.1 or higher is required])
;;
esac
AC_MSG_RESULT([$QT_VER ($QT_MAJOR)])