- updated for 3.1.1

Changed files:
    qt-qmake-opt.patch -> 1.2

diff --git a/qt-qmake-opt.patch b/qt-qmake-opt.patch
index 61b2b9bc0cc21031a09136528fe89fff3fbea854..320c1c45ef7faebbbe019d0175283c0f46b913bc 100644 (file)
--- a/qt-qmake-opt.patch
+++ b/qt-qmake-opt.patch
@@ -1,11 +1,12 @@
---- qt-x11-free-3.0.5/configure.orig   Thu Aug 29 21:41:47 2002
-+++ qt-x11-free-3.0.5/configure        Thu Aug 29 22:17:58 2002
-@@ -1755,6 +1755,8 @@
-       if [ "$CFG_DEBUG" = "yes" ]; then
-           grep "QMAKE_CFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf >> $mkfile
-         EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)"
-+      elif [ -n "$OPTFLAGS" ]; then
-+        EXTRA_CFLAGS="$EXTRA_CFLAGS $OPTFLAGS"
+--- qt-x11-free-3.1.1/configure.orig   Fri Nov 29 15:26:24 2002
++++ qt-x11-free-3.1.1/configure        Fri Feb 14 09:59:20 2003
+@@ -2185,6 +2185,9 @@
+             grep "QMAKE_CFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile
+           EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)"
          fi
-       if [ "$MAC_PLATFORM" = "yes" ]; then
-         echo "CARBON_LFLAGS +=-framework Carbon" >> $mkfile
++      if [ -n "$OPTFLAGS" ]; then
++          EXTRA_CFLAGS="$EXTRA_CFLAGS $OPTFLAGS"
++      fi
+       if [ "$PLATFORM_MAC" = "yes" ]; then
+           echo "CARBON_LFLAGS +=-framework CoreServices" >>$mkfile
+           EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"