summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-12 22:16:37 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-12 22:16:37 +0000
commitb6be43c63b2aa3cefedbc74e05b64f4e34214de4 (patch)
treecac5e034db37708d39227bbf2989b373aac78e6d
parent6d6110edecf0bd66cbdcb90ab246e034e36ed90e (diff)
downloadadmin-b6be43c63b2aa3cefedbc74e05b64f4e34214de4.tar.gz
admin-b6be43c63b2aa3cefedbc74e05b64f4e34214de4.zip
Fix TQt UIC detection
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common/admin@1214090 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--acinclude.m4.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in
index f73c8bb..4322fc9 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -333,7 +333,12 @@ AC_DEFUN([AC_PATH_QT_MOC_UIC],
KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
if test -z "$UIC_NOT_NEEDED"; then
- KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
+ if test $kde_qtver = 3; then
+ KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
+ fi
+ if test $kde_qtver = 4; then
+ KDE_FIND_PATH(uic-tqt, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
+ fi
if test -z "$UIC_PATH" ; then
KDE_UIC_ERROR_MESSAGE
exit 1