From e72d5e06a61b50d6ddb078d4f187b0b86101b79b Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 12 Jan 2011 22:16:37 +0000
Subject: Fix TQt UIC detection

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common@1214090 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 admin/acinclude.m4.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'admin/acinclude.m4.in')

diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
index f73c8bb..4322fc9 100644
--- a/admin/acinclude.m4.in
+++ b/admin/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
-- 
cgit v1.2.1