Skip to content

Commit 4b6a5a9

Browse files
author
gsherman
committedDec 30, 2005
Merge UI conversion branch to HEAD. UI branch is now deprecated.
git-svn-id: http://svn.osgeo.org/qgis/trunk@4409 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 1ac2e2e commit 4b6a5a9

File tree

380 files changed

+29828
-36043
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

380 files changed

+29828
-36043
lines changed
 

‎ChangeLog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/* ChangeLog,v 1.214 2004/11/12 00:42:21 gsherman Exp */
22
------------------------------------------------------------------------------
33
Version 0.8 'Joesephine' .... development version
4+
2005-12-29 [gsherman] 0.7.9.3
5+
** Merged Ui branch into HEAD
46
2005-11-10 [timlinux] 0.7.9.2
57
** Ported codebase to qt4 - still many issues to sort out but it builds
68
2005-11-10 [timlinux] 0.7.9.1

‎acinclude.m4

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,14 @@ if test $QT_MAJOR = "4" ; then
237237
AC_MSG_ERROR([*** moc must be in path])
238238
fi
239239
# uic3 is the Qt user interface compiler in Qt3 legacy mode
240-
AC_PATH_PROG(UIC, uic3, , [$PATH:$QTDIR/bin])
240+
AC_PATH_PROG(UIC, uic, , [$PATH:$QTDIR/bin])
241241
if test x$UIC = x ; then
242-
AC_MSG_ERROR([*** uic3 must be in path])
242+
AC_MSG_ERROR([*** uic must be in path])
243+
fi
244+
# check for rcc
245+
AC_PATH_PROG(RCC, rcc, , [$PATH:$QTDIR/bin])
246+
if test x$RCC = x ; then
247+
AC_MSG_ERROR([*** rcc must be in path])
243248
fi
244249
fi
245250

0 commit comments

Comments
 (0)
Please sign in to comment.