Update to reflect JMarc's comments.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8770 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 9c71c8913372798a1e24a2092f8d8bde5683966a..f8db6f8a878bb87f4ca376d3393f54cbab404754 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-19  Angus Leeming  <leeming@lyx.org>
+
+       * README.MacOSX: update to reflect Jean-Marc's comments to the list.
+
 2004-04-20  Angus Leeming  <leeming@lyx.org>
 
        * configure.ac: (AC_CONFIG_FILES) add gtk/gimages Makefile.

diff --git a/README.MacOSX b/README.MacOSX
index 02f3424ee4a288b582d1d4d16a2c87d55296214a..515d5a4040e0053e5c5ae20479650bf83e4b1ca9 100644 (file)
--- a/README.MacOSX
+++ b/README.MacOSX
@@ -23,6 +23,22 @@
      make 
      rm lib/libqt.la
 
+       Adendum, 19 May 2004. From comments by Jean-Marc
+       There now appears to be no need for this patch.
+
+       a. The additional line
+       +{ '^', MAP_KEY(Qt::Key_AsciiCircum) },
+       is fixed already in Qt/Mac 3.3.x.
+
+       b. The line commenting out 'ControlRef' to prevent a name
+       clash is also fixed in recent versions of the Qt library.
+
+       These instructions are still there in README.OSX because the 1.3.x
+       port relies on qt 3.1.x (because of other problems, I believe).
+
+       For the 1.4.x port, Bennett Helm aims at using the latest Qt version
+       with the current gcc 3 compiler.
+
    2.  Download the LyX/Mac skeleton from
        <ftp://ftp.lyx.org/pub/lyx/stable/lyx-mac-1.3.4-skeleton.tar.gz>
        and unpack it in /Applications.  Change the references to