ooo-build r12879 - in trunk: . patches/dev300

[brosenk svn gnome org]

Author: brosenk
Date: Fri Jun 13 10:40:58 2008
New Revision: 12879
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12879&view=rev

Log:
Don't link KDE4 code to Qt3


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/kde4-configure.diff

Modified: trunk/patches/dev300/kde4-configure.diff
==============================================================================
--- trunk/patches/dev300/kde4-configure.diff	(original)
+++ trunk/patches/dev300/kde4-configure.diff	Fri Jun 13 10:40:58 2008
@@ -16,6 +16,15 @@
      fi
      if test -n "$QTDIR" ; then
          qt_incdirs="$QTDIR/include $qt_incdirs"
+@@ -5630,7 +5630,7 @@ your KDE installation by exporting KDEDI
+ 
+     dnl Set the variables
+     KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
+-    KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lqt-mt"
++    KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lQtCore -lQtGui"
+ fi
+ AC_SUBST(KDE_CFLAGS)
+ AC_SUBST(KDE_LIBS)
 @@ -5656,11 +5656,11 @@
          fi
      fi