[patch] cursor.diff from faye

cursor.diff (text/plain), 2.94 KB, created by Seemant Kulleen (RETIRED) on 2003-02-08 18:09:58 UTC

? examples/trayicon/Makefile
? include/semantic.cache
? src/.obj/debug-shared-mt
? src/kernel/semantic.cache
Index: configure
===================================================================
RCS file: /home/kde/qt-copy/configure,v
retrieving revision 1.48
diff -u -3 -p -b -B -r1.48 configure
--- configure	2002/11/13 16:45:53	1.48
+++ configure	2002/11/23 02:07:36
@@ -264,6 +264,7 @@ CFG_XKB=auto
 CFG_NIS=auto
 CFG_CUPS=auto
 CFG_LARGEFILE=auto
+CFG_XCURSOR=no
 CFG_NEWABI=no ### need to break ABI for full Large File support...
 CFG_STL=auto
 CFG_NAS=no
@@ -330,7 +331,7 @@ while [ "$#" -gt 0 ]; do
 	VAL=no
 	;;
     #Qt style yes options
-    -incremental|-qvfb|-profile|-shared|-static|-sm|-thread|-xinerama|-tablet|-stl|-freetype|-big-codecs|-xrender|-xft|-xkb|-nis|-cups|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast)
+    -incremental|-qvfb|-profile|-shared|-static|-sm|-thread|-xinerama|-tablet|-stl|-freetype|-big-codecs|-xrender|-xft|-xkb|-nis|-cups|-largefile|-xcursor|-h|-help|-v|-verbose|-debug|-release|-fast)
 	VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
 	VAL=yes
 	;;
@@ -755,6 +756,13 @@ while [ "$#" -gt 0 ]; do
 	    UNKNOWN_OPT=yes
 	fi
 	;;
+    xcursor)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+	    CFG_XCURSOR="$VAL"
+        else
+	    UNKNOWN_OPT=yes
+        fi
+	;;
     newabi)
 	if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
 	    CFG_NEWABI="$VAL"
@@ -1695,6 +1703,7 @@ Usage:  $relconf [-prefix dir] [-buildke
 	[-no-largefile] [-largefile] [-no-stl] [-stl]
 	[-Istring] [-lstring] [-Lstring] [-Rstring] [-disable-<module>]
 	[-with-<module setting>] [-without-<module setting>] [-fast] [-no-fast]
+        [-xcursor]
 
 Installation options:
 
@@ -1861,6 +1870,13 @@ if [ "$PLATFORM_X11" = "yes" ]; then
 	XRY="*"
 	XRN=" "
     fi
+    if [ "$CFG_XCURSOR" = "no" ]; then
+	XCRY=" "
+	XCRN="*"
+    else
+	XCRY="*"
+	XCRN=" "
+    fi
     if [ "$CFG_TABLET" = "no" ]; then
 	XIY=" "
 	XIN="*"
@@ -1898,6 +1914,11 @@ Qt/X11 only:
  $XFTY  -xft ............... Compile Xft support.
 			 Requires X11/Xft/XftFreetype.h and libXft.
 
+ $XCRN  -no-xcursor ............ Do not compile with XCursor support 
+                                 (use native Qt cursors)
+ $XCRY  -xcursor ............... Compile XCursor support.
+
+
  $XIN  -no-tablet ......... Do not compile Tablet support.
  $XIY  -tablet ............ Compile Tablet support.
 			 Requires IRIX with wacom.h and libXi or
@@ -2731,6 +2752,10 @@ if [ "$CFG_LARGEFILE" = "yes" ]; then
     fi
 fi
 
+if [ "$CFG_XCURSOR" = "yes" ]; then
+    echo "#define QT_USE_APPROXIMATE_CURSORS">>$outpath/include/qconfig.h.new
+fi
+
 if [ -n "$QCONFIG_FLAGS" ]; then
     for cfg in $QCONFIG_FLAGS; do
 
@@ -2901,6 +2926,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then
     echo "Tablet support ...... $CFG_TABLET"
     echo "XRender support ..... $CFG_XRENDER"
     echo "Xft support ......... $CFG_FREETYPE"
+    echo "XCursor support ..... $CFG_XCURSOR"
     echo "XKB Support ......... $CFG_XKB"
 fi